diff --git a/common/src/main/java/org/keycloak/common/Profile.java b/common/src/main/java/org/keycloak/common/Profile.java index 57643c76ab..4d4fc8a220 100755 --- a/common/src/main/java/org/keycloak/common/Profile.java +++ b/common/src/main/java/org/keycloak/common/Profile.java @@ -67,8 +67,6 @@ public class Profile { CIBA("OpenID Connect Client Initiated Backchannel Authentication (CIBA)", Type.DEFAULT), - MAP_STORAGE("New store", Type.EXPERIMENTAL), - PAR("OAuth 2.0 Pushed Authorization Requests (PAR)", Type.DEFAULT), DECLARATIVE_USER_PROFILE("Configure user profiles using a declarative style", Type.PREVIEW), diff --git a/common/src/test/java/org/keycloak/common/ProfileTest.java b/common/src/test/java/org/keycloak/common/ProfileTest.java index 7233bc9e05..66110d03ff 100644 --- a/common/src/test/java/org/keycloak/common/ProfileTest.java +++ b/common/src/test/java/org/keycloak/common/ProfileTest.java @@ -82,7 +82,6 @@ public class ProfileTest { Profile.Feature.RECOVERY_CODES, Profile.Feature.SCRIPTS, Profile.Feature.TOKEN_EXCHANGE, - Profile.Feature.MAP_STORAGE, Profile.Feature.DECLARATIVE_USER_PROFILE, Profile.Feature.CLIENT_SECRET_ROTATION, Profile.Feature.UPDATE_EMAIL, 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 c5417c2cbc..85a319fc1d 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 @@ -31,7 +31,6 @@ import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.cluster.ClusterProvider; import org.keycloak.cluster.ClusterProviderFactory; -import org.keycloak.common.Profile; import org.keycloak.common.util.Retry; import org.keycloak.common.util.Time; import org.keycloak.connections.infinispan.DefaultInfinispanConnectionProviderFactory; @@ -40,7 +39,6 @@ import org.keycloak.connections.infinispan.TopologyInfo; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.connections.infinispan.InfinispanUtil; -import org.keycloak.provider.EnvironmentDependentProviderFactory; import java.io.Serializable; import java.util.Collection; @@ -57,7 +55,7 @@ import java.util.stream.Collectors; * * @author Marek Posolda */ -public class InfinispanClusterProviderFactory implements ClusterProviderFactory, EnvironmentDependentProviderFactory { +public class InfinispanClusterProviderFactory implements ClusterProviderFactory { public static final String PROVIDER_ID = "infinispan"; @@ -193,11 +191,6 @@ public class InfinispanClusterProviderFactory implements ClusterProviderFactory, return PROVIDER_ID; } - @Override - public boolean isSupported() { - return !Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE); - } - @Listener public class ViewChangeListener { 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 abdcca6b44..c44c79a70f 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 @@ -40,7 +40,6 @@ import org.keycloak.cluster.ClusterEvent; import org.keycloak.cluster.ClusterProvider; import org.keycloak.cluster.ManagedCacheManagerProvider; import org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory; -import org.keycloak.common.Profile; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.cache.infinispan.ClearCacheEvent; @@ -48,7 +47,6 @@ import org.keycloak.models.cache.infinispan.events.RealmRemovedEvent; import org.keycloak.models.cache.infinispan.events.RealmUpdatedEvent; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.PostMigrationEvent; -import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.provider.InvalidationHandler.ObjectType; import org.keycloak.provider.ProviderEvent; @@ -66,7 +64,7 @@ import static org.keycloak.models.cache.infinispan.InfinispanCacheRealmProviderF /** * @author Stian Thorgersen */ -public class DefaultInfinispanConnectionProviderFactory implements InfinispanConnectionProviderFactory, EnvironmentDependentProviderFactory { +public class DefaultInfinispanConnectionProviderFactory implements InfinispanConnectionProviderFactory { private static final Logger logger = Logger.getLogger(DefaultInfinispanConnectionProviderFactory.class); @@ -508,9 +506,4 @@ public class DefaultInfinispanConnectionProviderFactory implements InfinispanCon } }); } - - @Override - public boolean isSupported() { - return !Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE); - } } 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 0b563ab7d5..fa649d26a6 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 @@ -21,15 +21,13 @@ import org.infinispan.Cache; import org.keycloak.Config; import org.keycloak.cluster.ClusterEvent; import org.keycloak.cluster.ClusterProvider; -import org.keycloak.common.Profile; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.cache.CachePublicKeyProvider; import org.keycloak.models.cache.CachePublicKeyProviderFactory; -import org.keycloak.provider.EnvironmentDependentProviderFactory; -public class InfinispanCachePublicKeyProviderFactory implements CachePublicKeyProviderFactory, EnvironmentDependentProviderFactory { +public class InfinispanCachePublicKeyProviderFactory implements CachePublicKeyProviderFactory { public static final String PROVIDER_ID = "infinispan"; @@ -69,11 +67,6 @@ public class InfinispanCachePublicKeyProviderFactory implements CachePublicKeyPr } } - @Override - public boolean isSupported() { - return !Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE); - } - @Override public void init(Config.Scope config) { 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 fa2350d9b7..bfb6df3179 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 @@ -26,7 +26,6 @@ import java.util.concurrent.FutureTask; import org.infinispan.Cache; import org.jboss.logging.Logger; import org.keycloak.Config; -import org.keycloak.common.Profile; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.jose.jwk.JWK; import org.keycloak.keys.PublicKeyStorageProvider; @@ -36,7 +35,6 @@ import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; -import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.provider.ProviderEvent; @@ -45,7 +43,7 @@ import org.keycloak.provider.ProviderEventListener; /** * @author Marek Posolda */ -public class InfinispanPublicKeyStorageProviderFactory implements PublicKeyStorageProviderFactory, EnvironmentDependentProviderFactory { +public class InfinispanPublicKeyStorageProviderFactory implements PublicKeyStorageProviderFactory { private static final Logger log = Logger.getLogger(InfinispanPublicKeyStorageProviderFactory.class); @@ -164,11 +162,6 @@ public class InfinispanPublicKeyStorageProviderFactory implements PublicKeyStora } } - @Override - public boolean isSupported() { - return !Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE); - } - private static class SessionAndKeyHolder { private final KeycloakSession session; private final ArrayList cacheKeys; 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 d6f6095e0c..4dd147f764 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 @@ -19,10 +19,8 @@ package org.keycloak.models.sessions.infinispan; import org.jboss.logging.Logger; import org.keycloak.Config; -import org.keycloak.common.Profile; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.sessions.StickySessionEncoderProvider; @@ -34,7 +32,7 @@ import java.util.List; /** * @author Marek Posolda */ -public class InfinispanStickySessionEncoderProviderFactory implements StickySessionEncoderProviderFactory, EnvironmentDependentProviderFactory { +public class InfinispanStickySessionEncoderProviderFactory implements StickySessionEncoderProviderFactory { private static final Logger log = Logger.getLogger(InfinispanStickySessionEncoderProviderFactory.class); @@ -89,9 +87,4 @@ public class InfinispanStickySessionEncoderProviderFactory implements StickySess .add() .build(); } - - @Override - public boolean isSupported() { - return !Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE); - } } 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 db8722d943..20c887dbf2 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 @@ -23,11 +23,9 @@ import org.infinispan.persistence.remote.RemoteStore; import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.cluster.ClusterProvider; -import org.keycloak.common.Profile; import org.keycloak.common.util.Environment; import org.keycloak.common.util.Time; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; -import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.KeycloakSessionTask; @@ -60,7 +58,6 @@ import org.keycloak.models.sessions.infinispan.util.SessionTimeouts; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.PostMigrationEvent; import org.keycloak.models.utils.ResetTimeOffsetEvent; -import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.provider.ProviderEvent; import org.keycloak.provider.ProviderEventListener; @@ -69,7 +66,7 @@ import java.util.Set; import java.util.UUID; import static org.keycloak.models.sessions.infinispan.InfinispanAuthenticationSessionProviderFactory.PROVIDER_PRIORITY; -public class InfinispanUserSessionProviderFactory implements UserSessionProviderFactory, EnvironmentDependentProviderFactory { +public class InfinispanUserSessionProviderFactory implements UserSessionProviderFactory { private static final Logger log = Logger.getLogger(InfinispanUserSessionProviderFactory.class); @@ -361,10 +358,5 @@ public class InfinispanUserSessionProviderFactory implements UserSessionProvider public int order() { return PROVIDER_PRIORITY; } - - @Override - public boolean isSupported() { - return !Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE); - } } 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 5b50eab341..a13d09fa73 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,8 +16,6 @@ */ package org.keycloak.connections.jpa; -import org.keycloak.common.Profile; -import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.provider.ExceptionConverter; import jakarta.persistence.PersistenceException; @@ -26,7 +24,7 @@ import jakarta.persistence.PersistenceException; * @author Bill Burke * @version $Revision: 1 $ */ -public class JpaExceptionConverter implements ExceptionConverter, EnvironmentDependentProviderFactory { +public class JpaExceptionConverter implements ExceptionConverter { @Override public Throwable convert(Throwable e) { if (!(e instanceof PersistenceException)) return null; @@ -37,9 +35,4 @@ public class JpaExceptionConverter implements ExceptionConverter, EnvironmentDep public String getId() { return "jpa"; } - - @Override - public boolean isSupported() { - return !Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE); - } } 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 7a5972dd1d..64b25c75ab 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 @@ -20,19 +20,17 @@ 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.Profile; import org.keycloak.common.util.Time; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.dblock.DBLockProviderFactory; -import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; /** * @author Marek Posolda */ -public class LiquibaseDBLockProviderFactory implements DBLockProviderFactory, EnvironmentDependentProviderFactory { +public class LiquibaseDBLockProviderFactory implements DBLockProviderFactory { private static final Logger logger = Logger.getLogger(LiquibaseDBLockProviderFactory.class); public static final int PROVIDER_PRIORITY = 1; @@ -89,9 +87,4 @@ public class LiquibaseDBLockProviderFactory implements DBLockProviderFactory, En .helpText("The maximum time to wait when waiting to release a database lock.") .add().build(); } - - @Override - public boolean isSupported() { - return !Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE); - } } 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 8c10926e71..e4f2021699 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 @@ -18,20 +18,18 @@ package org.keycloak.models.jpa.session; import org.keycloak.Config; -import org.keycloak.common.Profile; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.session.UserSessionPersisterProvider; import org.keycloak.models.session.UserSessionPersisterProviderFactory; -import org.keycloak.provider.EnvironmentDependentProviderFactory; import jakarta.persistence.EntityManager; /** * @author Marek Posolda */ -public class JpaUserSessionPersisterProviderFactory implements UserSessionPersisterProviderFactory, EnvironmentDependentProviderFactory { +public class JpaUserSessionPersisterProviderFactory implements UserSessionPersisterProviderFactory { public static final String ID = "jpa"; @@ -65,9 +63,4 @@ public class JpaUserSessionPersisterProviderFactory implements UserSessionPersis public int order() { return 100; } - - @Override - public boolean isSupported() { - return !Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE); - } } 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 d6f60dd8b2..7e057032fa 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 @@ -17,11 +17,9 @@ package org.keycloak.storage.jpa; import org.keycloak.Config; -import org.keycloak.common.Profile; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.storage.federated.UserFederatedStorageProvider; import org.keycloak.storage.federated.UserFederatedStorageProviderFactory; @@ -31,7 +29,7 @@ import jakarta.persistence.EntityManager; * @author Bill Burke * @version $Revision: 1 $ */ -public class JpaUserFederatedStorageProviderFactory implements UserFederatedStorageProviderFactory, EnvironmentDependentProviderFactory { +public class JpaUserFederatedStorageProviderFactory implements UserFederatedStorageProviderFactory { @Override public UserFederatedStorageProvider create(KeycloakSession session) { EntityManager em = session.getProvider(JpaConnectionProvider.class).getEntityManager(); @@ -57,10 +55,4 @@ public class JpaUserFederatedStorageProviderFactory implements UserFederatedStor public String getId() { return "jpa"; } - - @Override - public boolean isSupported() { - return !Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE); - } - } diff --git a/model/legacy-private/src/main/java/org/keycloak/models/dblock/DBLockGlobalLockProviderFactory.java b/model/legacy-private/src/main/java/org/keycloak/models/dblock/DBLockGlobalLockProviderFactory.java index d34c31bd2b..27aa9ff56d 100644 --- a/model/legacy-private/src/main/java/org/keycloak/models/dblock/DBLockGlobalLockProviderFactory.java +++ b/model/legacy-private/src/main/java/org/keycloak/models/dblock/DBLockGlobalLockProviderFactory.java @@ -18,14 +18,12 @@ package org.keycloak.models.dblock; import org.keycloak.Config; -import org.keycloak.common.Profile; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.locking.GlobalLockProvider; import org.keycloak.models.locking.GlobalLockProviderFactory; -import org.keycloak.provider.EnvironmentDependentProviderFactory; -public class DBLockGlobalLockProviderFactory implements GlobalLockProviderFactory, EnvironmentDependentProviderFactory { +public class DBLockGlobalLockProviderFactory implements GlobalLockProviderFactory { public static final String PROVIDER_ID = "dblock"; @@ -49,9 +47,4 @@ public class DBLockGlobalLockProviderFactory implements GlobalLockProviderFactor public String getId() { return PROVIDER_ID; } - - @Override - public boolean isSupported() { - return !Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE); - } } diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/datastore/LegacyDatastoreProviderFactory.java b/model/legacy-private/src/main/java/org/keycloak/storage/datastore/LegacyDatastoreProviderFactory.java index dc93b68610..825be8eb13 100644 --- a/model/legacy-private/src/main/java/org/keycloak/storage/datastore/LegacyDatastoreProviderFactory.java +++ b/model/legacy-private/src/main/java/org/keycloak/storage/datastore/LegacyDatastoreProviderFactory.java @@ -19,12 +19,10 @@ package org.keycloak.storage.datastore; import org.keycloak.Config; import org.keycloak.Config.Scope; -import org.keycloak.common.Profile; import org.keycloak.migration.MigrationModelManager; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.utils.PostMigrationEvent; -import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.provider.ProviderEvent; import org.keycloak.provider.ProviderEventListener; import org.keycloak.services.scheduled.ClearExpiredAdminEvents; @@ -39,7 +37,7 @@ import org.keycloak.storage.LegacyStoreSyncEvent; import org.keycloak.storage.managers.UserStorageSyncManager; import org.keycloak.timer.TimerProvider; -public class LegacyDatastoreProviderFactory implements DatastoreProviderFactory, ProviderEventListener, EnvironmentDependentProviderFactory { +public class LegacyDatastoreProviderFactory implements DatastoreProviderFactory, ProviderEventListener { private static final String PROVIDER_ID = "legacy"; private long clientStorageProviderTimeout; @@ -110,10 +108,4 @@ public class LegacyDatastoreProviderFactory implements DatastoreProviderFactory, } } } - - @Override - public boolean isSupported() { - return ! Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE); - } - } diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/database/LegacyJpaConnectionProviderFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/database/LegacyJpaConnectionProviderFactory.java index bbcbf22b14..5ff2758a39 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/database/LegacyJpaConnectionProviderFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/database/LegacyJpaConnectionProviderFactory.java @@ -40,7 +40,6 @@ import io.quarkus.arc.Arc; import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.ServerStartupError; -import org.keycloak.common.Profile; import org.keycloak.common.Version; import org.keycloak.connections.jpa.DefaultJpaConnectionProvider; import org.keycloak.connections.jpa.JpaConnectionProvider; @@ -52,7 +51,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.dblock.DBLockGlobalLockProvider; import org.keycloak.models.locking.GlobalLockProvider; -import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.provider.ServerInfoAwareProviderFactory; @@ -62,8 +60,7 @@ import org.keycloak.quarkus.runtime.storage.database.jpa.AbstractJpaConnectionPr /** * @author Stian Thorgersen */ -public class LegacyJpaConnectionProviderFactory extends AbstractJpaConnectionProviderFactory implements ServerInfoAwareProviderFactory, - EnvironmentDependentProviderFactory { +public class LegacyJpaConnectionProviderFactory extends AbstractJpaConnectionProviderFactory implements ServerInfoAwareProviderFactory { public static final String QUERY_PROPERTY_PREFIX = "kc.query."; private static final Logger logger = Logger.getLogger(LegacyJpaConnectionProviderFactory.class); @@ -303,9 +300,4 @@ public class LegacyJpaConnectionProviderFactory extends AbstractJpaConnectionPro return null; }); } - - @Override - public boolean isSupported() { - return !Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE); - } } diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/LegacyInfinispanConnectionFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/LegacyInfinispanConnectionFactory.java index f8f0b42250..1913a6946d 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/LegacyInfinispanConnectionFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/LegacyInfinispanConnectionFactory.java @@ -18,15 +18,12 @@ package org.keycloak.quarkus.runtime.storage.legacy.infinispan; import org.infinispan.manager.EmbeddedCacheManager; -import org.keycloak.common.Profile; import org.keycloak.connections.infinispan.DefaultInfinispanConnectionProviderFactory; -import org.keycloak.provider.EnvironmentDependentProviderFactory; /** * @author Pedro Igor */ -public class LegacyInfinispanConnectionFactory extends DefaultInfinispanConnectionProviderFactory - implements EnvironmentDependentProviderFactory { +public class LegacyInfinispanConnectionFactory extends DefaultInfinispanConnectionProviderFactory { @Override protected EmbeddedCacheManager initContainerManaged(EmbeddedCacheManager cacheManager) { @@ -46,9 +43,4 @@ public class LegacyInfinispanConnectionFactory extends DefaultInfinispanConnecti public String getId() { return "quarkus"; } - - @Override - public boolean isSupported() { - return !Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE); - } } diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/liquibase/QuarkusJpaUpdaterProviderFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/liquibase/QuarkusJpaUpdaterProviderFactory.java index 14c808db27..de44ffe41a 100755 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/liquibase/QuarkusJpaUpdaterProviderFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/liquibase/QuarkusJpaUpdaterProviderFactory.java @@ -18,17 +18,15 @@ package org.keycloak.quarkus.runtime.storage.legacy.liquibase; import org.keycloak.Config; -import org.keycloak.common.Profile; import org.keycloak.connections.jpa.updater.JpaUpdaterProvider; import org.keycloak.connections.jpa.updater.JpaUpdaterProviderFactory; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.provider.EnvironmentDependentProviderFactory; /** * @author Stian Thorgersen */ -public class QuarkusJpaUpdaterProviderFactory implements JpaUpdaterProviderFactory, EnvironmentDependentProviderFactory { +public class QuarkusJpaUpdaterProviderFactory implements JpaUpdaterProviderFactory { @Override public JpaUpdaterProvider create(KeycloakSession session) { @@ -57,9 +55,4 @@ public class QuarkusJpaUpdaterProviderFactory implements JpaUpdaterProviderFacto public int order() { return 100; } - - @Override - public boolean isSupported() { - return !Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE); - } } diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/liquibase/QuarkusLiquibaseConnectionProvider.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/liquibase/QuarkusLiquibaseConnectionProvider.java index e079dbc011..d0166eaaed 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/liquibase/QuarkusLiquibaseConnectionProvider.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/liquibase/QuarkusLiquibaseConnectionProvider.java @@ -28,12 +28,10 @@ import liquibase.Scope; import liquibase.ui.LoggerUIService; import org.jboss.logging.Logger; import org.keycloak.Config; -import org.keycloak.common.Profile; import org.keycloak.connections.jpa.updater.liquibase.conn.LiquibaseConnectionProvider; import org.keycloak.connections.jpa.updater.liquibase.conn.LiquibaseConnectionProviderFactory; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.provider.EnvironmentDependentProviderFactory; import liquibase.Liquibase; import liquibase.database.Database; @@ -46,8 +44,7 @@ import liquibase.parser.core.xml.XMLChangeLogSAXParser; import liquibase.resource.ClassLoaderResourceAccessor; import liquibase.resource.ResourceAccessor; -public class QuarkusLiquibaseConnectionProvider implements LiquibaseConnectionProviderFactory, LiquibaseConnectionProvider, - EnvironmentDependentProviderFactory { +public class QuarkusLiquibaseConnectionProvider implements LiquibaseConnectionProviderFactory, LiquibaseConnectionProvider { private static final Logger logger = Logger.getLogger(QuarkusLiquibaseConnectionProvider.class); @@ -152,9 +149,4 @@ public class QuarkusLiquibaseConnectionProvider implements LiquibaseConnectionPr public int order() { return 100; } - - @Override - public boolean isSupported() { - return !Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE); - } } diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.unix.approved.txt index 7cc2bdbacd..2d11bba701 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.unix.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.unix.approved.txt @@ -48,17 +48,17 @@ Feature: account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, - multi-site, par, preview, recovery-codes, scripts, step-up-authentication, - token-exchange, transient-users, update-email, web-authn. + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, + preview, recovery-codes, scripts, step-up-authentication, token-exchange, + transient-users, update-email, web-authn. --features-disabled Disables a set of one or more features. Possible values are: account-api, account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, - multi-site, par, preview, recovery-codes, scripts, step-up-authentication, - token-exchange, transient-users, update-email, web-authn. + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, + preview, recovery-codes, scripts, step-up-authentication, token-exchange, + transient-users, update-email, web-authn. HTTP(S): diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.windows.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.windows.approved.txt index 70d55adbdf..36997647e7 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.windows.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.windows.approved.txt @@ -48,7 +48,7 @@ Feature: account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, par, + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, transient-users, update-email, web-authn. --features-disabled @@ -56,7 +56,7 @@ Feature: account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, par, + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, transient-users, update-email, web-authn. diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelp.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelp.unix.approved.txt index 53a0b75bd6..c25f10b63c 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelp.unix.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelp.unix.approved.txt @@ -59,17 +59,17 @@ Feature: account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, - multi-site, par, preview, recovery-codes, scripts, step-up-authentication, - token-exchange, transient-users, update-email, web-authn. + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, + preview, recovery-codes, scripts, step-up-authentication, token-exchange, + transient-users, update-email, web-authn. --features-disabled Disables a set of one or more features. Possible values are: account-api, account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, - multi-site, par, preview, recovery-codes, scripts, step-up-authentication, - token-exchange, transient-users, update-email, web-authn. + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, + preview, recovery-codes, scripts, step-up-authentication, token-exchange, + transient-users, update-email, web-authn. Config: @@ -151,4 +151,4 @@ Export: --users-per-file Set the number of users per file. It is used only if 'users' is set to 'different_files'. Increasing this number leads to exponentially increasing - export times. Default: 50. \ No newline at end of file + export times. Default: 50. diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelpAll.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelpAll.unix.approved.txt index b5a41d8b0f..c25f10b63c 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelpAll.unix.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelpAll.unix.approved.txt @@ -59,17 +59,17 @@ Feature: account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, - multi-site, par, preview, recovery-codes, scripts, step-up-authentication, - token-exchange, transient-users, update-email, web-authn. + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, + preview, recovery-codes, scripts, step-up-authentication, token-exchange, + transient-users, update-email, web-authn. --features-disabled Disables a set of one or more features. Possible values are: account-api, account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, - multi-site, par, preview, recovery-codes, scripts, step-up-authentication, - token-exchange, transient-users, update-email, web-authn. + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, + preview, recovery-codes, scripts, step-up-authentication, token-exchange, + transient-users, update-email, web-authn. Config: diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelp.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelp.unix.approved.txt index 58cd0eb971..6c058cfd16 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelp.unix.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelp.unix.approved.txt @@ -59,17 +59,17 @@ Feature: account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, - multi-site, par, preview, recovery-codes, scripts, step-up-authentication, - token-exchange, transient-users, update-email, web-authn. + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, + preview, recovery-codes, scripts, step-up-authentication, token-exchange, + transient-users, update-email, web-authn. --features-disabled Disables a set of one or more features. Possible values are: account-api, account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, - multi-site, par, preview, recovery-codes, scripts, step-up-authentication, - token-exchange, transient-users, update-email, web-authn. + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, + preview, recovery-codes, scripts, step-up-authentication, token-exchange, + transient-users, update-email, web-authn. Config: @@ -145,4 +145,4 @@ Import: --file Set the path to a file that will be read. --override Set if existing data should be overwritten. If set to false, data will be - ignored. Default: true. \ No newline at end of file + ignored. Default: true. diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelpAll.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelpAll.unix.approved.txt index 58cd0eb971..6c058cfd16 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelpAll.unix.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelpAll.unix.approved.txt @@ -59,17 +59,17 @@ Feature: account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, - multi-site, par, preview, recovery-codes, scripts, step-up-authentication, - token-exchange, transient-users, update-email, web-authn. + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, + preview, recovery-codes, scripts, step-up-authentication, token-exchange, + transient-users, update-email, web-authn. --features-disabled Disables a set of one or more features. Possible values are: account-api, account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, - multi-site, par, preview, recovery-codes, scripts, step-up-authentication, - token-exchange, transient-users, update-email, web-authn. + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, + preview, recovery-codes, scripts, step-up-authentication, token-exchange, + transient-users, update-email, web-authn. Config: @@ -145,4 +145,4 @@ Import: --file Set the path to a file that will be read. --override Set if existing data should be overwritten. If set to false, data will be - ignored. Default: true. \ No newline at end of file + ignored. Default: true. diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.unix.approved.txt index 8635796b03..19091a0e9b 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.unix.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.unix.approved.txt @@ -75,17 +75,17 @@ Feature: account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, - multi-site, par, preview, recovery-codes, scripts, step-up-authentication, - token-exchange, transient-users, update-email, web-authn. + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, + preview, recovery-codes, scripts, step-up-authentication, token-exchange, + transient-users, update-email, web-authn. --features-disabled Disables a set of one or more features. Possible values are: account-api, account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, - multi-site, par, preview, recovery-codes, scripts, step-up-authentication, - token-exchange, transient-users, update-email, web-authn. + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, + preview, recovery-codes, scripts, step-up-authentication, token-exchange, + transient-users, update-email, web-authn. Hostname: @@ -266,4 +266,4 @@ Security: Do NOT start the server using this command when deploying to production. Use 'kc.sh start-dev --help-all' to list all available options, including build -options. \ No newline at end of file +options. diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.windows.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.windows.approved.txt index 5546b6274b..85414e1083 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.windows.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.windows.approved.txt @@ -73,7 +73,7 @@ Feature: account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, par, + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, transient-users, update-email, web-authn. --features-disabled @@ -81,7 +81,7 @@ Feature: account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, par, + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, transient-users, update-email, web-authn. diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.unix.approved.txt index 8635796b03..19091a0e9b 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.unix.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.unix.approved.txt @@ -75,17 +75,17 @@ Feature: account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, - multi-site, par, preview, recovery-codes, scripts, step-up-authentication, - token-exchange, transient-users, update-email, web-authn. + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, + preview, recovery-codes, scripts, step-up-authentication, token-exchange, + transient-users, update-email, web-authn. --features-disabled Disables a set of one or more features. Possible values are: account-api, account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, - multi-site, par, preview, recovery-codes, scripts, step-up-authentication, - token-exchange, transient-users, update-email, web-authn. + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, + preview, recovery-codes, scripts, step-up-authentication, token-exchange, + transient-users, update-email, web-authn. Hostname: @@ -266,4 +266,4 @@ Security: Do NOT start the server using this command when deploying to production. Use 'kc.sh start-dev --help-all' to list all available options, including build -options. \ No newline at end of file +options. diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.windows.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.windows.approved.txt index 5546b6274b..85414e1083 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.windows.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.windows.approved.txt @@ -73,7 +73,7 @@ Feature: account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, par, + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, transient-users, update-email, web-authn. --features-disabled @@ -81,7 +81,7 @@ Feature: account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, par, + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, transient-users, update-email, web-authn. diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.unix.approved.txt index 5e47d17251..67bd64f9fe 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.unix.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.unix.approved.txt @@ -76,17 +76,17 @@ Feature: account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, - multi-site, par, preview, recovery-codes, scripts, step-up-authentication, - token-exchange, transient-users, update-email, web-authn. + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, + preview, recovery-codes, scripts, step-up-authentication, token-exchange, + transient-users, update-email, web-authn. --features-disabled Disables a set of one or more features. Possible values are: account-api, account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, - multi-site, par, preview, recovery-codes, scripts, step-up-authentication, - token-exchange, transient-users, update-email, web-authn. + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, + preview, recovery-codes, scripts, step-up-authentication, token-exchange, + transient-users, update-email, web-authn. Hostname: @@ -271,4 +271,4 @@ By default, this command tries to update the server configuration by running a $ kc.sh start '--optimized' By doing that, the server should start faster based on any previous -configuration you have set when manually running the 'build' command. \ No newline at end of file +configuration you have set when manually running the 'build' command. diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.windows.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.windows.approved.txt index 6994c9d1fb..9c74bc4f57 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.windows.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.windows.approved.txt @@ -74,7 +74,7 @@ Feature: account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, par, + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, transient-users, update-email, web-authn. --features-disabled @@ -82,7 +82,7 @@ Feature: account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, par, + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, transient-users, update-email, web-authn. diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.unix.approved.txt index 5e47d17251..67bd64f9fe 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.unix.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.unix.approved.txt @@ -76,17 +76,17 @@ Feature: account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, - multi-site, par, preview, recovery-codes, scripts, step-up-authentication, - token-exchange, transient-users, update-email, web-authn. + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, + preview, recovery-codes, scripts, step-up-authentication, token-exchange, + transient-users, update-email, web-authn. --features-disabled Disables a set of one or more features. Possible values are: account-api, account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, - multi-site, par, preview, recovery-codes, scripts, step-up-authentication, - token-exchange, transient-users, update-email, web-authn. + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, + preview, recovery-codes, scripts, step-up-authentication, token-exchange, + transient-users, update-email, web-authn. Hostname: @@ -271,4 +271,4 @@ By default, this command tries to update the server configuration by running a $ kc.sh start '--optimized' By doing that, the server should start faster based on any previous -configuration you have set when manually running the 'build' command. \ No newline at end of file +configuration you have set when manually running the 'build' command. diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.windows.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.windows.approved.txt index 6994c9d1fb..9c74bc4f57 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.windows.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.windows.approved.txt @@ -74,7 +74,7 @@ Feature: account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, par, + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, transient-users, update-email, web-authn. --features-disabled @@ -82,7 +82,7 @@ Feature: account2, account3, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, device-flow, docker, dpop, dynamic-scopes, fips, - impersonation, js-adapter, kerberos, linkedin-oauth, map-storage, par, + impersonation, js-adapter, kerberos, linkedin-oauth, multi-site, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, transient-users, update-email, web-authn. diff --git a/server-spi-private/src/main/java/org/keycloak/models/locking/NoneGlobalLockProviderFactory.java b/server-spi-private/src/main/java/org/keycloak/models/locking/NoneGlobalLockProviderFactory.java deleted file mode 100644 index 798fe0b8d3..0000000000 --- a/server-spi-private/src/main/java/org/keycloak/models/locking/NoneGlobalLockProviderFactory.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright 2022 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.keycloak.models.locking; - -import org.keycloak.Config; -import org.keycloak.common.Profile; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.KeycloakSessionTaskWithResult; -import org.keycloak.models.utils.KeycloakModelUtils; -import org.keycloak.provider.EnvironmentDependentProviderFactory; - -import java.time.Duration; - -public class NoneGlobalLockProviderFactory implements GlobalLockProviderFactory, EnvironmentDependentProviderFactory { - - public static final String PROVIDER_ID = "none"; - - @Override - public GlobalLockProvider create(KeycloakSession session) { - return new GlobalLockProvider() { - @Override - public void close() { - } - - @Override - public V withLock(String lockName, Duration timeToWaitForLock, KeycloakSessionTaskWithResult task) { - return KeycloakModelUtils.runJobInTransactionWithResult(session.getKeycloakSessionFactory(), task); - } - - @Override - public void forceReleaseAllLocks() { - - } - }; - } - - @Override - public void init(Config.Scope config) { - - } - - @Override - public void postInit(KeycloakSessionFactory factory) { - - } - - @Override - public void close() { - - } - - @Override - public String getId() { - return PROVIDER_ID; - } - - @Override - public boolean isSupported() { - return Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE); - } -} diff --git a/server-spi-private/src/main/java/org/keycloak/sessions/DisabledStickySessionEncoderProvider.java b/server-spi-private/src/main/java/org/keycloak/sessions/DisabledStickySessionEncoderProvider.java deleted file mode 100644 index efc14e24fa..0000000000 --- a/server-spi-private/src/main/java/org/keycloak/sessions/DisabledStickySessionEncoderProvider.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright 2022 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.keycloak.sessions; - -import org.keycloak.Config; -import org.keycloak.common.Profile; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.provider.EnvironmentDependentProviderFactory; -import org.keycloak.sessions.StickySessionEncoderProvider; -import org.keycloak.sessions.StickySessionEncoderProviderFactory; - -public class DisabledStickySessionEncoderProvider implements StickySessionEncoderProviderFactory, StickySessionEncoderProvider, - EnvironmentDependentProviderFactory { - - @Override - public StickySessionEncoderProvider create(KeycloakSession session) { - return this; - } - - @Override - public String encodeSessionId(String sessionId) { - return sessionId; - } - - @Override - public String decodeSessionId(String encodedSessionId) { - return encodedSessionId; - } - - @Override - public boolean shouldAttachRoute() { - return false; - } - - @Override - public void init(Config.Scope config) { - - } - - @Override - public void postInit(KeycloakSessionFactory factory) { - - } - - @Override - public void close() { - - } - - @Override - public String getId() { - return "disabled"; - } - - @Override - public boolean isSupported() { - return Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE); - } - -} diff --git a/server-spi-private/src/main/java/org/keycloak/utils/LockObjectsForModification.java b/server-spi-private/src/main/java/org/keycloak/utils/LockObjectsForModification.java index d2b5dd2883..832ec28400 100644 --- a/server-spi-private/src/main/java/org/keycloak/utils/LockObjectsForModification.java +++ b/server-spi-private/src/main/java/org/keycloak/utils/LockObjectsForModification.java @@ -17,7 +17,6 @@ package org.keycloak.utils; -import org.keycloak.common.Profile; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserSessionModel; @@ -72,19 +71,8 @@ public class LockObjectsForModification { } private static V lockObjectsForModification(KeycloakSession session, Class model, CallableWithoutThrowingAnException callable) { - // Only map storage supports locking objects for modification, skip the logic if it is not enabled. - if (!Profile.isFeatureEnabled(Profile.Feature.MAP_STORAGE)) { - return callable.call(); - } - - if (LockObjectsForModification.isEnabled(session, model)) { - // If someone nests the call, and it would already be locked, don't try to lock it a second time. - // Otherwise, the inner unlocking might also unlock the outer lock. - return callable.call(); - } - try (LockObjectsForModification.Enabled ignored = new Enabled(session, model)) { - return callable.call(); - } + // Only map storage supported locking objects for modification, this logic will be remove in a follow up PR + return callable.call(); } @FunctionalInterface diff --git a/server-spi-private/src/main/resources/META-INF/services/org.keycloak.models.locking.GlobalLockProviderFactory b/server-spi-private/src/main/resources/META-INF/services/org.keycloak.models.locking.GlobalLockProviderFactory deleted file mode 100644 index b0c6891c30..0000000000 --- a/server-spi-private/src/main/resources/META-INF/services/org.keycloak.models.locking.GlobalLockProviderFactory +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright 2021 Red Hat, Inc. and/or its affiliates -# and other contributors as indicated by the @author tags. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -org.keycloak.models.locking.NoneGlobalLockProviderFactory diff --git a/server-spi-private/src/main/resources/META-INF/services/org.keycloak.sessions.StickySessionEncoderProviderFactory b/server-spi-private/src/main/resources/META-INF/services/org.keycloak.sessions.StickySessionEncoderProviderFactory deleted file mode 100644 index 9d86397968..0000000000 --- a/server-spi-private/src/main/resources/META-INF/services/org.keycloak.sessions.StickySessionEncoderProviderFactory +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright 2022 Red Hat, Inc. and/or its affiliates -# and other contributors as indicated by the @author tags. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -org.keycloak.sessions.DisabledStickySessionEncoderProvider \ No newline at end of file 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 4c73d9f49c..025fa88ead 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 @@ -26,9 +26,7 @@ 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.Profile; import org.keycloak.common.util.reflections.Reflections; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import org.keycloak.testsuite.client.KeycloakTestingClient; @@ -51,7 +49,7 @@ public class ModelTestExecutor extends LocalTestExecuter { super.execute(event); } else { TestResult result = new TestResult(); - if (annotation.skipForMapStorage() && ProfileAssume.isFeatureEnabled(Profile.Feature.MAP_STORAGE)) { + if (annotation.skipForMapStorage()) { result = TestResult.skipped(); } else { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java index d311670c8a..77f0c333d8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java @@ -22,7 +22,6 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.keycloak.common.Profile.Feature; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; @@ -36,7 +35,6 @@ import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.storage.UserStorageProvider; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.adapter.AbstractServletsAdapterTest; import org.keycloak.testsuite.adapter.page.ProductPortal; import org.keycloak.testsuite.admin.ApiUtil; @@ -56,7 +54,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.junit.BeforeClass; import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlEquals; import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWithLoginUrlOf; @@ -90,12 +87,6 @@ public class UserStorageConsentTest extends AbstractServletsAdapterTest { return servletDeployment(ProductPortal.DEPLOYMENT_NAME, ProductServlet.class); } - @BeforeClass - public static void checkNotMapStorage() { - // This test requires user storage SPI - ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE); - } - @Before public void addProvidersBeforeTest() throws URISyntaxException, IOException { ComponentRepresentation memProvider = new ComponentRepresentation(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/PermissionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/PermissionsTest.java index 86450d478e..eddb0c811d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/PermissionsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/PermissionsTest.java @@ -1799,9 +1799,6 @@ public class PermissionsTest extends AbstractKeycloakTest { @Test public void partialExport() { - // re-enable as part of https://github.com/keycloak/keycloak/issues/14291 - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - invoke(realm -> realm.partialExport(false, false), clients.get("view-realm"), false); invoke(realm -> realm.partialExport(false, false), clients.get("manage-realm"), true); invoke(realm -> realm.partialExport(true, false), clients.get("manage-realm"), false); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java index 0fa1115356..4ac685b991 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java @@ -3079,8 +3079,6 @@ public class UserTest extends AbstractAdminTest { @Test public void testUpdateCredentialLabelForFederatedUser() { - ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE); - // Create user federation ComponentRepresentation memProvider = new ComponentRepresentation(); memProvider.setName("memory"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/FlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/FlowTest.java index b3762abd2c..4fe469305d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/FlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/FlowTest.java @@ -462,7 +462,6 @@ public class FlowTest extends AbstractAuthenticationTest { @Test public void failWithLongDescription() throws IOException { - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); ContainerAssume.assumeAuthServerQuarkus(); AuthenticationFlowRepresentation rep = authMgmtResource.getFlows().stream() .filter(new Predicate() { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/partialexport/PartialExportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/partialexport/PartialExportTest.java index 1f7ea5dc45..a95387ef8f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/partialexport/PartialExportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/partialexport/PartialExportTest.java @@ -1,7 +1,6 @@ package org.keycloak.testsuite.admin.partialexport; import org.junit.Test; -import org.keycloak.common.Profile; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.ClientSecretConstants; import org.keycloak.representations.idm.ClientRepresentation; @@ -13,7 +12,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.ScopeMappingRepresentation; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.AbstractAdminTest; import java.util.HashMap; @@ -46,9 +44,6 @@ public class PartialExportTest extends AbstractAdminTest { @Test public void testExport() { - // re-enable as part of https://github.com/keycloak/keycloak/issues/14291 - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - // exportGroupsAndRoles == false, exportClients == false RealmRepresentation rep = adminClient.realm(EXPORT_TEST_REALM).partialExport(false, false); Assert.assertNull("Users are null", rep.getUsers()); 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 ce65202bad..ec38b1dd97 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 @@ -4,7 +4,6 @@ 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; -import org.keycloak.common.Profile; import org.keycloak.common.util.Time; import org.keycloak.models.IdentityProviderMapperSyncMode; import org.keycloak.models.IdentityProviderSyncMode; @@ -19,7 +18,6 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.services.Urls; import org.keycloak.storage.UserStorageProvider; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.federation.DummyUserFederationProviderFactory; import org.keycloak.testsuite.util.AccountHelper; @@ -632,9 +630,6 @@ public abstract class AbstractAdvancedBrokerTest extends AbstractBrokerTest { */ @Test public void testWithLinkedFederationProvider() { - // don't run this test when map storage is enabled, as map storage doesn't support the legacy style federation - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - try { updateExecutions(AbstractBrokerTest::disableUpdateProfileOnFirstLogin); 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 d09d2f0016..0df1b33ad6 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 @@ -145,7 +145,6 @@ public class AccountLinkTest extends AbstractKeycloakTest { @Test @Ignore // Ignore should be removed by https://github.com/keycloak/keycloak/issues/20441 public void testAccountLinkWithUserStorageProvider() { - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); String childUsername = PassThroughFederatedUserStorageProvider.PASSTHROUGH_USERNAME; String childPassword = PassThroughFederatedUserStorageProvider.INITIAL_PASSWORD; 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 718da3fd35..88bc8bbfd2 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 @@ -26,7 +26,6 @@ import org.junit.Before; import org.junit.Test; import org.keycloak.admin.client.resource.RealmResource; -import org.keycloak.common.Profile; import org.keycloak.common.util.*; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.crypto.Algorithm; @@ -42,7 +41,6 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.KeysMetadataRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.client.resources.TestingCacheResource; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.util.AccountHelper; @@ -99,8 +97,6 @@ public class KcOIDCBrokerWithSignatureTest extends AbstractBaseBrokerTest { @Test public void testSignatureVerificationJwksUrl() throws Exception { - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - // Configure OIDC identity provider with JWKS URL updateIdentityProviderWithJwksUrl(); @@ -309,8 +305,6 @@ public class KcOIDCBrokerWithSignatureTest extends AbstractBaseBrokerTest { @Test public void testClearKeysCache() throws Exception { - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - // Configure OIDC identity provider with JWKS URL updateIdentityProviderWithJwksUrl(); @@ -336,8 +330,6 @@ public class KcOIDCBrokerWithSignatureTest extends AbstractBaseBrokerTest { // Test that when I update identityProvier, then the record in publicKey cache is cleared and it's not possible to authenticate with it anymore @Test public void testPublicKeyCacheInvalidatedWhenProviderUpdated() throws Exception { - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - // Configure OIDC identity provider with JWKS URL updateIdentityProviderWithJwksUrl(); 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 843a9a29ec..cd532e9919 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 @@ -39,7 +39,6 @@ import org.junit.Before; import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.client.registration.Auth; -import org.keycloak.common.Profile; import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.constants.ServiceUrlConstants; @@ -59,7 +58,6 @@ import org.keycloak.representations.idm.ClientInitialAccessPresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.oidc.OIDCClientRepresentation; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; import org.keycloak.testsuite.rest.resource.TestingOIDCEndpointsApplicationResource; @@ -172,8 +170,6 @@ public class OIDCJwksClientRegistrationTest extends AbstractClientRegistrationTe @Test public void testTwoClientsWithSameKid() throws Exception { - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - // Create client with manually set "kid" OIDCClientRepresentation response = createClientWithManuallySetKid("a1"); @@ -213,8 +209,6 @@ public class OIDCJwksClientRegistrationTest extends AbstractClientRegistrationTe @Test public void testPublicKeyCacheInvalidatedWhenUpdatingClient() throws Exception { - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - OIDCClientRepresentation response = createClientWithManuallySetKid("a1"); Map generatedKeys = testingClient.testApp().oidcClientEndpoints().getKeysAsPem(); @@ -268,8 +262,6 @@ public class OIDCJwksClientRegistrationTest extends AbstractClientRegistrationTe @Test public void createClientWithJWKSURI_rotateClientKeys() throws Exception { - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - OIDCClientRepresentation clientRep = createRep(); clientRep.setGrantTypes(Collections.singletonList(OAuth2Constants.CLIENT_CREDENTIALS)); 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 51ad5d9f7e..004f33b1e0 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,13 +17,10 @@ package org.keycloak.testsuite.domainextension; -import org.junit.BeforeClass; import org.junit.Test; -import org.keycloak.common.Profile; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.client.resources.TestExampleCompanyResource; import org.keycloak.testsuite.util.RealmBuilder; @@ -46,11 +43,6 @@ public class CustomExtensionTest extends AbstractKeycloakTest { testRealms.add(foo); } - @BeforeClass - public static void checkNotMapStorage() { - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - } - @Test public void testDomainExtension() throws Exception { companyResource().createCompany("foo", buildCompany("foo-company")); 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 3935f16615..b9477f012a 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 @@ -21,11 +21,9 @@ 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.BeforeClass; import org.junit.Test; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.authentication.requiredactions.WebAuthnRegisterFactory; -import org.keycloak.common.Profile.Feature; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.exportimport.ExportImportConfig; import org.keycloak.exportimport.Strategy; @@ -43,7 +41,6 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.client.resources.TestingExportImportResource; import org.keycloak.testsuite.forms.VerifyProfileTest; import org.keycloak.testsuite.runonserver.RunHelpers; @@ -81,12 +78,6 @@ public class ExportImportTest extends AbstractKeycloakTest { private static final String TEST_REALM = "test-realm"; - @BeforeClass - public static void checkNotMapStorage() { - // Disabled temporarily, re-enable once export/import functionality is implemented for map storage - ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE); - } - @Override public void addTestRealms(List testRealms) { RealmRepresentation testRealm1 = loadJson(getClass().getResourceAsStream("/testrealm.json"), RealmRepresentation.class); 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 1df9b27d65..388f34ef55 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 @@ -49,7 +49,6 @@ import org.keycloak.OAuth2Constants; import org.keycloak.adapters.HttpClientBuilder; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.authentication.authenticators.browser.SpnegoAuthenticatorFactory; -import org.keycloak.common.Profile.Feature; import org.keycloak.common.constants.KerberosConstants; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.events.Details; @@ -69,7 +68,6 @@ import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.testsuite.AbstractAuthTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; @@ -134,11 +132,6 @@ public abstract class AbstractKerberosTest extends AbstractAuthTest { return adminClient.realm("test"); } - @BeforeClass - public static void checkNotMapStorage() { - ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE); - } - @BeforeClass public static void checkKerberosSupportedByAuthServer() { KerberosUtils.assumeKerberosSupportExpected(); 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 e65fb821f6..734650de5d 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 @@ -22,10 +22,8 @@ import java.util.List; 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.Profile; import org.keycloak.events.Details; import org.keycloak.federation.kerberos.CommonKerberosConfig; import org.keycloak.representations.idm.ComponentRepresentation; @@ -33,7 +31,6 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.ldap.LDAPStorageProviderFactory; import org.keycloak.storage.ldap.kerberos.LDAPProviderKerberosConfig; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.KerberosRule; import org.keycloak.testsuite.KerberosEmbeddedServer; @@ -67,12 +64,6 @@ public class KerberosLdapTest extends AbstractKerberosSingleRealmTest { return getUserStorageConfiguration("kerberos-ldap", LDAPStorageProviderFactory.PROVIDER_NAME); } - @Before - public void before() { - // don't run this test when map storage is enabled, as map storage doesn't support the legacy style federation - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - } - @Test public void spnegoLoginTest() throws Exception { assertSuccessfulSpnegoLogin("hnelson", "hnelson", "secret"); 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 344a908121..0f75ae75ca 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 @@ -23,7 +23,6 @@ import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; import org.keycloak.testsuite.Assert; -import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.keycloak.admin.client.resource.UserResource; @@ -40,7 +39,6 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.storage.UserStorageProvider; import org.keycloak.testsuite.ActionURIUtils; import org.keycloak.testsuite.KerberosEmbeddedServer; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; @@ -68,12 +66,6 @@ public class KerberosStandaloneTest extends AbstractKerberosSingleRealmTest { return kerberosRule; } - @Before - public void before() { - // don't run this test when map storage is enabled, as map storage doesn't support the legacy style federation - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - } - @Override protected CommonKerberosConfig getKerberosConfig() { return new KerberosConfig(getUserStorageConfiguration()); 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 bccd39a7e6..1cabc4e94e 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 @@ -17,7 +17,6 @@ package org.keycloak.testsuite.federation.ldap; -import org.keycloak.common.Profile.Feature; import java.util.Map; import org.jboss.arquillian.graphene.page.Page; @@ -27,14 +26,12 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.storage.ldap.mappers.LDAPStorageMapper; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; import org.keycloak.testsuite.pages.OAuthGrantPage; import org.keycloak.testsuite.pages.RegisterPage; import org.keycloak.testsuite.util.LDAPRule; -import org.junit.BeforeClass; /** * @author Marek Posolda @@ -78,12 +75,6 @@ public abstract class AbstractLDAPTest extends AbstractTestRealmKeycloakTest { afterImportTestRealm(); } - @BeforeClass - public static void checkNotMapStorage() { - ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE); - } - - protected void createLDAPProvider() { Map cfg = getLDAPRule().getConfig(); ldapModelId = testingClient.testing().ldap(TEST_REALM_NAME).createLDAPProvider(cfg, isImportEnabled()); 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 d375c05893..59ff928564 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 @@ -34,7 +34,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runners.MethodSorters; import org.keycloak.broker.provider.util.SimpleHttp; -import org.keycloak.common.Profile; import org.keycloak.federation.kerberos.KerberosFederationProvider; import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; @@ -45,7 +44,6 @@ import org.keycloak.representations.idm.ErrorRepresentation; import org.keycloak.services.messages.Messages; import org.keycloak.services.resources.account.AccountCredentialResource; import org.keycloak.storage.ldap.idm.model.LDAPObject; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; import org.keycloak.testsuite.util.TokenUtil; @@ -73,8 +71,6 @@ public class LDAPAccountRestApiTest extends AbstractLDAPTest { @Before public void before() { - // don't run this test when map storage is enabled, as map storage doesn't support the legacy style federation - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); httpClient = HttpClientBuilder.create().build(); } 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 d31b9b123f..badcb899c8 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 @@ -18,13 +18,11 @@ 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.OAuth2Constants; -import org.keycloak.common.Profile; import org.keycloak.component.ComponentModel; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.RealmRepresentation; @@ -32,7 +30,6 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.ldap.LDAPStorageProvider; import org.keycloak.storage.ldap.idm.model.LDAPObject; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.LDAPRule; @@ -64,12 +61,6 @@ public class LDAPLegacyImportTest extends AbstractLDAPTest { return ldapRule; } - @Before - public void before() { - // don't run this test when map storage is enabled, as map storage doesn't support the legacy style federation - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - } - @Override public void addTestRealms(List testRealms) { RealmRepresentation testRealm = loadJson(getClass().getResourceAsStream("/ldap/fed-provider-export.json"), RealmRepresentation.class); 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 9c6f1d8395..c3d32acb63 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 @@ -19,12 +19,10 @@ package org.keycloak.testsuite.federation.ldap; import org.junit.Assert; import org.junit.Assume; -import org.junit.Before; import org.junit.ClassRule; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; -import org.keycloak.common.Profile; import org.keycloak.models.ClientModel; import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; @@ -36,7 +34,6 @@ import org.keycloak.storage.UserStoragePrivateUtil; import org.keycloak.storage.UserStorageUtil; import org.keycloak.storage.ldap.LDAPStorageProvider; import org.keycloak.storage.ldap.idm.model.LDAPObject; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestConfiguration; import org.keycloak.testsuite.util.LDAPTestUtils; @@ -71,12 +68,6 @@ public class LDAPMultipleAttributesTest extends AbstractLDAPTest { return ldapRule; } - @Before - public void before() { - // don't run this test when map storage is enabled, as map storage doesn't support LDAP, yet - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - } - @Override protected void afterImportTestRealm() { testingClient.server().run(session -> { 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 03bba28cdf..d908775b71 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 @@ -19,12 +19,10 @@ 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.common.Profile; import org.keycloak.component.ComponentModel; import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; @@ -37,7 +35,6 @@ import org.keycloak.storage.ldap.idm.model.LDAPObject; import org.keycloak.storage.ldap.mappers.HardcodedLDAPAttributeMapper; import org.keycloak.storage.ldap.mappers.HardcodedLDAPAttributeMapperFactory; import org.keycloak.storage.ldap.mappers.LDAPStorageMapper; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.util.AccountHelper; @@ -98,12 +95,6 @@ public class LDAPPasswordModifyExtensionTest extends AbstractLDAPTest { }); } - @Before - public void before() { - // don't run this test when map storage is enabled, as map storage doesn't support the legacy style federation - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - } - @Test public void ldapPasswordChangeWithAccountConsole() throws Exception { Assert.assertTrue(AccountHelper.updatePassword(testRealm(), "johnkeycloak", "New-password1")); 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 9cd62a31ee..cdb9853707 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 @@ -19,7 +19,6 @@ package org.keycloak.testsuite.federation.ldap; import org.junit.Assert; import org.junit.Assume; -import org.junit.Before; import org.junit.ClassRule; import org.junit.FixMethodOrder; import org.junit.Test; @@ -27,7 +26,6 @@ import org.junit.runners.MethodSorters; import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; -import org.keycloak.common.Profile; import org.keycloak.component.ComponentModel; import org.keycloak.credential.CredentialModel; import org.keycloak.events.EventType; @@ -68,7 +66,6 @@ import org.keycloak.storage.ldap.mappers.HardcodedLDAPRoleStorageMapperFactory; import org.keycloak.storage.ldap.mappers.LDAPStorageMapper; import org.keycloak.storage.ldap.mappers.UserAttributeLDAPStorageMapper; import org.keycloak.testsuite.AbstractAuthTest; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.util.AccountHelper; @@ -105,12 +102,6 @@ public class LDAPProvidersIntegrationTest extends AbstractLDAPTest { return ldapRule; } - @Before - public void before() { - // don't run this test when map storage is enabled, as map storage doesn't support LDAP, yet - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - } - @Override protected void afterImportTestRealm() { testingClient.server().run(session -> { 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 dcf6771b84..b3cab5cff3 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 @@ -20,14 +20,12 @@ package org.keycloak.testsuite.federation.ldap; import org.jboss.arquillian.graphene.page.Page; 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.OAuth2Constants; import org.keycloak.admin.client.resource.UserResource; -import org.keycloak.common.Profile; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; @@ -39,7 +37,6 @@ import org.keycloak.storage.StorageId; import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.ldap.LDAPStorageProvider; import org.keycloak.storage.ldap.idm.model.LDAPObject; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginConfigTotpPage; @@ -75,12 +72,6 @@ public class LDAPReadOnlyTest extends AbstractLDAPTest { private TimeBasedOTP totp = new TimeBasedOTP(); - @Before - public void before() { - // don't run this test when map storage is enabled, as map storage doesn't support LDAP, yet - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - } - @Override protected void afterImportTestRealm() { testingClient.server().run(session -> { 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 ea66cdc230..fcb3d2e09d 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 @@ -144,9 +144,6 @@ public class LDAPSamlIdPInitiatedVaryingLetterCaseTest extends AbstractLDAPTest @Before public void setupIdentityProvider() { - // don't run this test when map storage is enabled, as map storage doesn't support LDAP, yet - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - // Configure autolink flow AuthenticationFlowRepresentation newFlow = new AuthenticationFlowRepresentation(); newFlow.setAlias(FLOW_AUTO_LINK); 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 d508ec3fa1..2678a804c5 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 @@ -18,13 +18,11 @@ 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.OAuth2Constants; -import org.keycloak.common.Profile; import org.keycloak.component.ComponentModel; import org.keycloak.models.GroupModel; import org.keycloak.models.LDAPConstants; @@ -37,7 +35,6 @@ import org.keycloak.storage.ldap.idm.model.LDAPObject; import org.keycloak.storage.ldap.mappers.membership.LDAPGroupMapperMode; import org.keycloak.storage.ldap.mappers.membership.group.GroupLDAPStorageMapperFactory; import org.keycloak.storage.ldap.mappers.membership.group.GroupMapperConfig; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestConfiguration; @@ -97,12 +94,6 @@ public class LDAPSpecialCharsTest extends AbstractLDAPTest { }); } - @Before - public void before() { - // don't run this test when map storage is enabled, as map storage doesn't support the legacy style federation - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - } - @Test public void test01_userSearch() { List users = adminClient.realm("test").users().search("j*", 0, 10); 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 af1c9064b0..0dff5afdd1 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 @@ -19,13 +19,11 @@ package org.keycloak.testsuite.federation.ldap; import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; import org.junit.FixMethodOrder; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExternalResource; import org.junit.runners.MethodSorters; -import org.keycloak.common.Profile; import org.keycloak.events.Errors; import org.keycloak.events.EventType; import org.keycloak.models.LDAPConstants; @@ -35,7 +33,6 @@ import org.keycloak.models.ModelException; import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.storage.ldap.idm.model.LDAPObject; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.arquillian.annotation.EnableVault; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; @@ -112,12 +109,6 @@ public class LDAPUserLoginTest extends AbstractLDAPTest { DEFAULT_TEST_USERS.put("VALID_USER_STREET", "1th Avenue"); } - @Before - public void before() { - // don't run this test when map storage is enabled, as map storage doesn't support LDAP, yet - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - } - @Override protected void afterImportTestRealm() { try { 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 4810cc54a1..4903de2248 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 @@ -3,7 +3,6 @@ package org.keycloak.testsuite.federation.ldap; import org.jboss.arquillian.graphene.page.Page; import org.junit.Assert; -import org.junit.Before; import org.junit.FixMethodOrder; import org.junit.Rule; import org.junit.Test; @@ -12,7 +11,6 @@ import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.authentication.authenticators.browser.OTPFormAuthenticatorFactory; import org.keycloak.authentication.authenticators.browser.PasswordFormFactory; import org.keycloak.authentication.authenticators.browser.UsernameFormFactory; -import org.keycloak.common.Profile; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; @@ -20,7 +18,6 @@ import org.keycloak.models.credential.OTPCredentialModel; import org.keycloak.models.utils.DefaultAuthenticationFlows; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.storage.ldap.idm.model.LDAPObject; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.arquillian.annotation.EnableVault; import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.pages.LoginTotpPage; @@ -64,12 +61,6 @@ public class LDAPUserMultipleCredentialTest extends AbstractLDAPTest { return ldapRule; } - @Before - public void before() { - // don't run this test when map storage is enabled, as map storage doesn't support LDAP, yet - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - } - @Override protected void afterImportTestRealm() { getTestingClient().server().run(session -> { 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 716ee47393..52efa66ece 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 @@ -24,7 +24,6 @@ import java.util.Set; import org.jboss.arquillian.graphene.page.Page; import org.junit.Assert; -import org.junit.Before; import org.junit.ClassRule; import org.junit.FixMethodOrder; import org.junit.Test; @@ -42,7 +41,6 @@ import org.keycloak.representations.userprofile.config.UPAttributePermissions; import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.ldap.idm.model.LDAPObject; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.forms.VerifyProfileTest; @@ -72,12 +70,6 @@ public class LDAPUserProfileTest extends AbstractLDAPTest { return ldapRule; } - @Before - public void before() { - // don't run this test when map storage is enabled, as map storage doesn't support LDAP, yet - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - } - @Override protected void afterImportTestRealm() { testingClient.server().run(session -> { 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 11448b7a92..bd87bdfd55 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 @@ -5,14 +5,12 @@ import org.junit.Before; import org.junit.Test; import org.keycloak.admin.client.resource.GroupResource; import org.keycloak.admin.client.resource.UserResource; -import org.keycloak.common.Profile.Feature; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.KeycloakSession; import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.storage.UserStorageProvider; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.concurrency.AbstractConcurrencyTest; import org.keycloak.testsuite.federation.UserMapStorage; import org.keycloak.testsuite.federation.UserMapStorageFactory; @@ -26,7 +24,6 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.BeforeClass; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; @@ -44,11 +41,6 @@ public abstract class AbstractUserStorageDirtyDeletionTest extends AbstractConcu private List> createdUsers; - @BeforeClass - public static void checkNotMapStorage() { - ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE); - } - public static void remove20UsersFromStorageProvider(KeycloakSession session) { assertThat(REMOVED_USERS_COUNT, Matchers.lessThan(NUM_USERS)); final RealmModel realm = session.realms().getRealmByName(TEST_REALM_NAME); 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 51051b4026..4ccd2affb1 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 @@ -22,11 +22,9 @@ 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.BeforeClass; import org.junit.Test; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.broker.provider.util.SimpleHttp; -import org.keycloak.common.Profile.Feature; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; @@ -43,7 +41,6 @@ import org.keycloak.storage.StorageId; import org.keycloak.storage.UserStorageProvider; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.federation.BackwardsCompatibilityUserStorageFactory; import org.keycloak.testsuite.pages.AppPage; @@ -88,13 +85,6 @@ public class BackwardsCompatibilityUserStorageTest extends AbstractTestRealmKeyc private TimeBasedOTP totp = new TimeBasedOTP(); - - - @BeforeClass - public static void checkNotMapStorage() { - ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE); - } - @Before public void addProvidersBeforeTest() throws URISyntaxException, IOException { ComponentRepresentation memProvider = new ComponentRepresentation(); 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 727515e40e..dc6f5d429f 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 @@ -24,7 +24,6 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.keycloak.OAuth2Constants; -import org.keycloak.common.Profile.Feature; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.events.Details; @@ -44,7 +43,6 @@ import org.keycloak.storage.client.ClientStorageProvider; import org.keycloak.storage.client.ClientStorageProviderModel; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.federation.HardcodedClientStorageProviderFactory; @@ -79,7 +77,6 @@ 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; -import org.junit.BeforeClass; /** * Test that clients can override auth flows @@ -113,11 +110,6 @@ public class ClientStorageTest extends AbstractTestRealmKeycloakTest { return id; } - @BeforeClass - public static void checkNotMapStorage() { - ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE); - } - @Before public void addProvidersBeforeTest() throws URISyntaxException, IOException { ComponentRepresentation provider = new ComponentRepresentation(); 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 d7221acb22..dcae65a4a7 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,7 +17,6 @@ package org.keycloak.testsuite.federation.storage; -import org.keycloak.common.Profile.Feature; import org.junit.Before; import org.junit.Test; import org.keycloak.common.util.MultivaluedHashMap; @@ -29,7 +28,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.storage.StorageId; import org.keycloak.storage.group.GroupStorageProvider; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.federation.HardcodedGroupStorageProviderFactory; @@ -39,7 +37,6 @@ import java.io.IOException; import java.net.URISyntaxException; import java.util.stream.Collectors; -import org.junit.BeforeClass; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.not; @@ -62,11 +59,6 @@ public class GroupStorageTest extends AbstractTestRealmKeycloakTest { } } - @BeforeClass - public static void checkNotMapStorage() { - ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE); - } - @Before public void addProvidersBeforeTest() throws URISyntaxException, IOException { ComponentRepresentation provider = new ComponentRepresentation(); 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 6daad957e3..746d2a31eb 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 @@ -17,7 +17,6 @@ package org.keycloak.testsuite.federation.storage; -import org.keycloak.common.Profile.Feature; import java.io.IOException; import java.net.URISyntaxException; import java.util.stream.Collectors; @@ -38,11 +37,9 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.storage.StorageId; import org.keycloak.storage.role.RoleStorageProvider; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.federation.HardcodedRoleStorageProviderFactory; -import org.junit.BeforeClass; public class RoleStorageTest extends AbstractTestRealmKeycloakTest { @@ -60,11 +57,6 @@ public class RoleStorageTest extends AbstractTestRealmKeycloakTest { } } - @BeforeClass - public static void checkNotMapStorage() { - ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE); - } - @Before public void addProvidersBeforeTest() throws URISyntaxException, IOException { ComponentRepresentation provider = new ComponentRepresentation(); 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 785c505f2d..386bb1529c 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,7 +16,6 @@ */ package org.keycloak.testsuite.migration; -import org.keycloak.common.Profile.Feature; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; @@ -24,8 +23,6 @@ import static org.hamcrest.Matchers.is; import org.junit.Before; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.ProfileAssume; -import org.junit.BeforeClass; import static org.keycloak.testsuite.auth.page.AuthRealm.MASTER; /** @@ -36,11 +33,6 @@ public abstract class AbstractJsonFileImportMigrationTest extends AbstractMigrat protected RealmRepresentation masterRep; protected String masterTestClientId; - @BeforeClass - public static void checkNotMapStorage() { - ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE); - } - @Before public void beforeMigrationTest() { migrationRealm = adminClient.realms().realm(MIGRATION); 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 9778ac26b0..da255f77aa 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,7 +17,6 @@ package org.keycloak.testsuite.model; -import org.keycloak.common.Profile.Feature; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -38,13 +37,11 @@ import org.keycloak.services.managers.RealmManager; import org.keycloak.services.managers.UserConsentManager; import org.keycloak.storage.client.ClientStorageProviderModel; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.ProfileAssume; 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.BeforeClass; /** * @author Marek Posolda @@ -55,12 +52,6 @@ public class UserConsentModelTest extends AbstractTestRealmKeycloakTest { private static String realmId; - @BeforeClass - public static void checkNotMapStorage() { - // This test requires legacy client storage - ProfileAssume.assumeFeatureDisabled(Feature.MAP_STORAGE); - } - @Before public void before() { testingClient.server().run(session -> { 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 43b86b491b..8995752ee6 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 @@ -53,7 +53,6 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.util.ClientBuilder; @@ -747,11 +746,6 @@ public class ResourceOwnerPasswordCredentialsGrantTest extends AbstractKeycloakT } private int getAuthenticationSessionsCount() { - if (ProfileAssume.isFeatureEnabled(Profile.Feature.MAP_STORAGE)) { - // Currently, no access to the authentication sessions is available for map storage. - // By return a constant, all tests in this test class can still pass. - return 0; - } return testingClient.testing().cache(InfinispanConnectionProvider.AUTHENTICATION_SESSIONS_CACHE_NAME).size(); } } 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 36db8e7e51..2e9968ac70 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 @@ -20,9 +20,7 @@ package org.keycloak.testsuite.session; import org.infinispan.Cache; import org.junit.After; import org.junit.Assert; -import org.junit.BeforeClass; import org.junit.Test; -import org.keycloak.common.Profile; import org.keycloak.common.util.Retry; import org.keycloak.common.util.Time; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; @@ -34,7 +32,6 @@ import org.keycloak.models.sessions.infinispan.changes.sessions.SessionData; import org.keycloak.models.sessions.infinispan.entities.UserSessionEntity; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.runonserver.RunOnServer; import org.keycloak.timer.TimerProvider; @@ -52,11 +49,6 @@ public class LastSessionRefreshUnitTest extends AbstractKeycloakTest { } - @BeforeClass - public static void checkNotMapStorage() { - ProfileAssume.assumeFeatureDisabled(Profile.Feature.MAP_STORAGE); - } - @After public void cleanupPeriodicTask() { // Cleanup unneeded periodic task, which was added during this test diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/globalLock/GlobalLocksTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/globalLock/GlobalLocksTest.java index cc504d1342..7f07f84f4c 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/globalLock/GlobalLocksTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/globalLock/GlobalLocksTest.java @@ -23,7 +23,6 @@ import org.junit.Test; import org.keycloak.models.dblock.DBLockGlobalLockProviderFactory; import org.keycloak.models.locking.GlobalLockProvider; import org.keycloak.models.locking.LockAcquiringTimeoutException; -import org.keycloak.models.locking.NoneGlobalLockProviderFactory; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; @@ -45,7 +44,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; @RequireProvider(value = GlobalLockProvider.class, - exclude = { NoneGlobalLockProviderFactory.PROVIDER_ID, DBLockGlobalLockProviderFactory.PROVIDER_ID } + exclude = { DBLockGlobalLockProviderFactory.PROVIDER_ID } ) public class GlobalLocksTest extends KeycloakModelTest {