From a5593469aed79f5b24d877cc1c09085762303806 Mon Sep 17 00:00:00 2001 From: Bill Burke Date: Tue, 15 Jul 2014 15:44:50 -0400 Subject: [PATCH] rename ModelProvider->RealmProvider --- .../audit/email/EmailAuditListener.java | 6 ++--- .../ExternalModelAuthenticationProvider.java | 3 +-- .../exportimport/util/ImportUtils.java | 17 +++++-------- .../util/MultipleStepsExportProvider.java | 6 ++--- .../singlefile/SingleFileExportProvider.java | 4 +-- .../org/keycloak/models/KeycloakSession.java | 2 +- ...{ModelProvider.java => RealmProvider.java} | 2 +- ...Factory.java => RealmProviderFactory.java} | 2 +- .../models/{ModelSpi.java => RealmSpi.java} | 8 +++--- .../services/org.keycloak.provider.Spi | 2 +- .../models/cache/ApplicationAdapter.java | 2 +- ...lProvider.java => CacheRealmProvider.java} | 6 ++--- ...ry.java => CacheRealmProviderFactory.java} | 2 +- ...derSpi.java => CacheRealmProviderSpi.java} | 8 +++--- .../keycloak/models/cache/ClientAdapter.java | 4 +-- ...er.java => DefaultCacheRealmProvider.java} | 12 ++++----- ...a => MemoryCacheRealmProviderFactory.java} | 6 ++--- ...rovider.java => NoCacheRealmProvider.java} | 12 ++++----- ....java => NoCacheRealmProviderFactory.java} | 6 ++--- .../models/cache/OAuthClientAdapter.java | 2 +- .../keycloak/models/cache/RealmAdapter.java | 4 +-- .../keycloak/models/cache/RoleAdapter.java | 4 +-- .../keycloak/models/cache/UserAdapter.java | 2 +- .../cache/entities/CachedApplication.java | 4 +-- .../models/cache/entities/CachedClient.java | 4 +-- .../cache/entities/CachedOAuthClient.java | 4 +-- .../models/cache/entities/CachedRealm.java | 4 +-- ...oak.models.cache.CacheModelProviderFactory | 2 -- ...oak.models.cache.CacheRealmProviderFactory | 2 ++ .../services/org.keycloak.provider.Spi | 2 +- ...delProvider.java => JpaRealmProvider.java} | 6 ++--- ...tory.java => JpaRealmProviderFactory.java} | 10 ++++---- .../org/keycloak/models/jpa/RealmAdapter.java | 6 ++--- .../org.keycloak.models.ModelProviderFactory | 1 - .../org.keycloak.models.RealmProviderFactory | 1 + .../keycloak/adapters/ClientAdapter.java | 6 ++--- ...lProvider.java => MongoRealmProvider.java} | 6 ++--- ...ry.java => MongoRealmProviderFactory.java} | 12 ++++----- .../mongo/keycloak/adapters/RealmAdapter.java | 6 ++--- .../org.keycloak.models.ModelProviderFactory | 1 - .../org.keycloak.models.RealmProviderFactory | 1 + .../model/test/AbstractModelTest.java | 10 ++++---- .../resources/META-INF/keycloak-server.json | 6 ++--- .../services/DefaultKeycloakSession.java | 16 ++++++------ .../services/managers/ApplianceBootstrap.java | 2 +- .../managers/BruteForceProtector.java | 2 +- .../services/managers/RealmManager.java | 6 ++--- .../resources/admin/AdminConsole.java | 2 +- .../resources/admin/RealmsAdminResource.java | 2 +- .../scheduled/ClearExpiredAuditEvents.java | 2 +- .../scheduled/ClearExpiredUserSessions.java | 2 +- .../resources/META-INF/keycloak-server.json | 8 +++--- .../testsuite/adapter/AdapterTest.java | 14 +++++------ .../exportimport/ExportImportTest.java | 25 ------------------- .../model/UserSessionProviderTest.java | 4 +-- .../testsuite/oauth/RefreshTokenTest.java | 16 ++++++------ .../testsuite/rule/AbstractKeycloakRule.java | 4 +-- .../keycloak/testsuite/rule/KeycloakRule.java | 2 +- .../BaseJMeterPerformanceTest.java | 2 +- .../performance/CreateUsersWorker.java | 2 +- .../performance/ReadUsersWorker.java | 2 +- .../performance/RemoveUsersWorker.java | 2 +- .../org/keycloak/test/tools/PerfTools.java | 5 +--- 63 files changed, 151 insertions(+), 185 deletions(-) rename model/api/src/main/java/org/keycloak/models/{ModelProvider.java => RealmProvider.java} (91%) rename model/api/src/main/java/org/keycloak/models/{ModelProviderFactory.java => RealmProviderFactory.java} (66%) rename model/api/src/main/java/org/keycloak/models/{ModelSpi.java => RealmSpi.java} (76%) mode change 100644 => 100755 rename model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/{CacheModelProvider.java => CacheRealmProvider.java} (71%) rename model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/{CacheModelProviderFactory.java => CacheRealmProviderFactory.java} (65%) rename model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/{CacheModelProviderSpi.java => CacheRealmProviderSpi.java} (70%) rename model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/{DefaultCacheModelProvider.java => DefaultCacheRealmProvider.java} (94%) rename model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/{MemoryCacheModelProviderFactory.java => MemoryCacheRealmProviderFactory.java} (70%) rename model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/{NoCacheModelProvider.java => NoCacheRealmProvider.java} (87%) rename model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/{NoCacheModelProviderFactory.java => NoCacheRealmProviderFactory.java} (74%) delete mode 100755 model/invalidation-cache/model-adapters/src/main/resources/META-INF/services/org.keycloak.models.cache.CacheModelProviderFactory create mode 100755 model/invalidation-cache/model-adapters/src/main/resources/META-INF/services/org.keycloak.models.cache.CacheRealmProviderFactory rename model/jpa/src/main/java/org/keycloak/models/jpa/{JpaModelProvider.java => JpaRealmProvider.java} (93%) rename model/jpa/src/main/java/org/keycloak/models/jpa/{JpaModelProviderFactory.java => JpaRealmProviderFactory.java} (67%) delete mode 100644 model/jpa/src/main/resources/META-INF/services/org.keycloak.models.ModelProviderFactory create mode 100755 model/jpa/src/main/resources/META-INF/services/org.keycloak.models.RealmProviderFactory rename model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/{MongoModelProvider.java => MongoRealmProvider.java} (94%) rename model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/{MongoModelProviderFactory.java => MongoRealmProviderFactory.java} (69%) delete mode 100644 model/mongo/src/main/resources/META-INF/services/org.keycloak.models.ModelProviderFactory create mode 100755 model/mongo/src/main/resources/META-INF/services/org.keycloak.models.RealmProviderFactory mode change 100644 => 100755 services/src/main/java/org/keycloak/services/scheduled/ClearExpiredAuditEvents.java diff --git a/audit/email/src/main/java/org/keycloak/audit/email/EmailAuditListener.java b/audit/email/src/main/java/org/keycloak/audit/email/EmailAuditListener.java index dd70b05266..6f50c4e778 100755 --- a/audit/email/src/main/java/org/keycloak/audit/email/EmailAuditListener.java +++ b/audit/email/src/main/java/org/keycloak/audit/email/EmailAuditListener.java @@ -7,7 +7,7 @@ import org.keycloak.audit.EventType; import org.keycloak.email.EmailException; import org.keycloak.email.EmailProvider; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ModelProvider; +import org.keycloak.models.RealmProvider; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; @@ -21,13 +21,13 @@ public class EmailAuditListener implements AuditListener { private static final Logger log = Logger.getLogger(EmailAuditListener.class); private KeycloakSession session; - private ModelProvider model; + private RealmProvider model; private EmailProvider emailProvider; private Set includedEvents; public EmailAuditListener(KeycloakSession session, EmailProvider emailProvider, Set includedEvents) { this.session = session; - this.model = session.model(); + this.model = session.realms(); this.emailProvider = emailProvider; this.includedEvents = includedEvents; } diff --git a/authentication/authentication-model/src/main/java/org/keycloak/authentication/model/ExternalModelAuthenticationProvider.java b/authentication/authentication-model/src/main/java/org/keycloak/authentication/model/ExternalModelAuthenticationProvider.java index 1abf05f7c9..e109360188 100755 --- a/authentication/authentication-model/src/main/java/org/keycloak/authentication/model/ExternalModelAuthenticationProvider.java +++ b/authentication/authentication-model/src/main/java/org/keycloak/authentication/model/ExternalModelAuthenticationProvider.java @@ -3,7 +3,6 @@ package org.keycloak.authentication.model; import org.keycloak.authentication.AuthProviderConstants; import org.keycloak.authentication.AuthenticationProviderException; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ModelProvider; import org.keycloak.models.RealmModel; import java.util.Arrays; @@ -39,7 +38,7 @@ public class ExternalModelAuthenticationProvider extends AbstractModelAuthentica throw new AuthenticationProviderException("Option '" + AuthProviderConstants.EXTERNAL_REALM_ID + "' not specified in configuration"); } - RealmModel realm = keycloakSession.model().getRealm(realmId); + RealmModel realm = keycloakSession.realms().getRealm(realmId); if (realm == null) { throw new AuthenticationProviderException("Realm with id '" + realmId + "' doesn't exists"); } diff --git a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ImportUtils.java b/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ImportUtils.java index 6487a01811..b1d37ba5e6 100755 --- a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ImportUtils.java +++ b/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ImportUtils.java @@ -2,17 +2,13 @@ package org.keycloak.exportimport.util; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.codehaus.jackson.JsonEncoding; import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonGenerator; import org.codehaus.jackson.JsonParser; import org.codehaus.jackson.JsonToken; -import org.codehaus.jackson.io.SerializedString; import org.codehaus.jackson.map.ObjectMapper; import org.jboss.logging.Logger; import org.keycloak.Config; @@ -20,10 +16,9 @@ import org.keycloak.exportimport.Strategy; import org.keycloak.models.AdminRoles; import org.keycloak.models.ApplicationModel; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ModelProvider; +import org.keycloak.models.RealmProvider; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; -import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.RepresentationToModel; import org.keycloak.representations.idm.RealmRepresentation; @@ -46,7 +41,7 @@ public class ImportUtils { */ public static RealmModel importRealm(KeycloakSession session, RealmRepresentation rep, Strategy strategy) { String realmName = rep.getRealm(); - ModelProvider model = session.model(); + RealmProvider model = session.realms(); RealmModel realm = model.getRealmByName(realmName); if (realm != null) { @@ -72,7 +67,7 @@ public class ImportUtils { return realm; } - private static void refreshMasterAdminApps(ModelProvider model, RealmModel realm) { + private static void refreshMasterAdminApps(RealmProvider model, RealmModel realm) { String adminRealmId = Config.getAdminRealm(); if (adminRealmId.equals(realm.getId())) { // We just imported master realm. All 'masterAdminApps' need to be refreshed @@ -98,7 +93,7 @@ public class ImportUtils { } // TODO: We need method here, so we are able to refresh masterAdmin applications after import. Should be RealmManager moved to model/api instead? - public static void setupMasterAdminManagement(ModelProvider model, RealmModel realm) { + public static void setupMasterAdminManagement(RealmProvider model, RealmModel realm) { RealmModel adminRealm; RoleModel adminRole; @@ -160,7 +155,7 @@ public class ImportUtils { // Assuming that it's invoked inside transaction public static void importUsersFromStream(KeycloakSession session, String realmName, ObjectMapper mapper, InputStream is) throws IOException { - ModelProvider model = session.model(); + RealmProvider model = session.realms(); JsonFactory factory = mapper.getJsonFactory(); JsonParser parser = factory.createJsonParser(is); try { @@ -200,7 +195,7 @@ public class ImportUtils { } } - private static void importUsers(KeycloakSession session, ModelProvider model, String realmName, List userReps) { + private static void importUsers(KeycloakSession session, RealmProvider model, String realmName, List userReps) { RealmModel realm = model.getRealmByName(realmName); Map apps = realm.getApplicationNameMap(); for (UserRepresentation user : userReps) { diff --git a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java b/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java index 19134ab307..392e07370a 100755 --- a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java +++ b/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java @@ -28,7 +28,7 @@ public abstract class MultipleStepsExportProvider implements ExportProvider { @Override public void run(KeycloakSession session) { - List realms = session.model().getRealms(); + List realms = session.realms().getRealms(); holder.realms = realms; } @@ -49,7 +49,7 @@ public abstract class MultipleStepsExportProvider implements ExportProvider { @Override public void run(KeycloakSession session) throws IOException { - RealmModel realm = session.model().getRealmByName(realmName); + RealmModel realm = session.realms().getRealmByName(realmName); RealmRepresentation rep = ExportUtils.exportRealm(session, realm, exportUsersIntoSameFile); writeRealm(realmName + "-realm.json", rep); logger.info("Realm '" + realmName + "' - data exported"); @@ -81,7 +81,7 @@ public abstract class MultipleStepsExportProvider implements ExportProvider { @Override public void run(KeycloakSession session) throws IOException { - RealmModel realm = session.model().getRealmByName(realmName); + RealmModel realm = session.realms().getRealmByName(realmName); // TODO: pagination List users = session.users().getUsers(realm); usersHolder.users = users.subList(usersHolder.currentPageStart, usersHolder.currentPageEnd); diff --git a/export-import/export-import-single-file/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java b/export-import/export-import-single-file/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java index 724152b77d..a27f086de6 100755 --- a/export-import/export-import-single-file/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java +++ b/export-import/export-import-single-file/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java @@ -42,7 +42,7 @@ public class SingleFileExportProvider implements ExportProvider { @Override public void run(KeycloakSession session) throws IOException { - List realms = session.model().getRealms(); + List realms = session.realms().getRealms(); List reps = new ArrayList(); for (RealmModel realm : realms) { reps.add(ExportUtils.exportRealm(session, realm, true)); @@ -62,7 +62,7 @@ public class SingleFileExportProvider implements ExportProvider { @Override public void run(KeycloakSession session) throws IOException { - RealmModel realm = session.model().getRealmByName(realmName); + RealmModel realm = session.realms().getRealmByName(realmName); RealmRepresentation realmRep = ExportUtils.exportRealm(session, realm, true); writeToFile(realmRep); } diff --git a/model/api/src/main/java/org/keycloak/models/KeycloakSession.java b/model/api/src/main/java/org/keycloak/models/KeycloakSession.java index af3dff0e24..16a5a6798d 100755 --- a/model/api/src/main/java/org/keycloak/models/KeycloakSession.java +++ b/model/api/src/main/java/org/keycloak/models/KeycloakSession.java @@ -27,7 +27,7 @@ public interface KeycloakSession { * @return * @throws IllegalStateException if transaction is not active */ - ModelProvider model(); + RealmProvider realms(); /** * Returns a managed provider instance. Will start a provider transaction. This transaction is managed by the KeycloakSession diff --git a/model/api/src/main/java/org/keycloak/models/ModelProvider.java b/model/api/src/main/java/org/keycloak/models/RealmProvider.java similarity index 91% rename from model/api/src/main/java/org/keycloak/models/ModelProvider.java rename to model/api/src/main/java/org/keycloak/models/RealmProvider.java index a39fedb624..4ec3c87591 100755 --- a/model/api/src/main/java/org/keycloak/models/ModelProvider.java +++ b/model/api/src/main/java/org/keycloak/models/RealmProvider.java @@ -8,7 +8,7 @@ import java.util.List; * @author Bill Burke * @version $Revision: 1 $ */ -public interface ModelProvider extends Provider { +public interface RealmProvider extends Provider { // Note: The reason there are so many query methods here is for layering a cache on top of an persistent KeycloakSession RealmModel createRealm(String name); diff --git a/model/api/src/main/java/org/keycloak/models/ModelProviderFactory.java b/model/api/src/main/java/org/keycloak/models/RealmProviderFactory.java similarity index 66% rename from model/api/src/main/java/org/keycloak/models/ModelProviderFactory.java rename to model/api/src/main/java/org/keycloak/models/RealmProviderFactory.java index 4842118cf4..d11f0b8a03 100755 --- a/model/api/src/main/java/org/keycloak/models/ModelProviderFactory.java +++ b/model/api/src/main/java/org/keycloak/models/RealmProviderFactory.java @@ -6,5 +6,5 @@ import org.keycloak.provider.ProviderFactory; * @author Bill Burke * @version $Revision: 1 $ */ -public interface ModelProviderFactory extends ProviderFactory { +public interface RealmProviderFactory extends ProviderFactory { } diff --git a/model/api/src/main/java/org/keycloak/models/ModelSpi.java b/model/api/src/main/java/org/keycloak/models/RealmSpi.java old mode 100644 new mode 100755 similarity index 76% rename from model/api/src/main/java/org/keycloak/models/ModelSpi.java rename to model/api/src/main/java/org/keycloak/models/RealmSpi.java index 7e944ba7cd..1c1429c229 --- a/model/api/src/main/java/org/keycloak/models/ModelSpi.java +++ b/model/api/src/main/java/org/keycloak/models/RealmSpi.java @@ -7,21 +7,21 @@ import org.keycloak.provider.Spi; /** * @author Stian Thorgersen */ -public class ModelSpi implements Spi { +public class RealmSpi implements Spi { @Override public String getName() { - return "model"; + return "realm"; } @Override public Class getProviderClass() { - return ModelProvider.class; + return RealmProvider.class; } @Override public Class getProviderFactoryClass() { - return ModelProviderFactory.class; + return RealmProviderFactory.class; } } diff --git a/model/api/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/model/api/src/main/resources/META-INF/services/org.keycloak.provider.Spi index 2e55a8a770..706ba92934 100755 --- a/model/api/src/main/resources/META-INF/services/org.keycloak.provider.Spi +++ b/model/api/src/main/resources/META-INF/services/org.keycloak.provider.Spi @@ -1,3 +1,3 @@ -org.keycloak.models.ModelSpi +org.keycloak.models.RealmSpi org.keycloak.models.UserSessionSpi org.keycloak.models.UserSpi \ No newline at end of file diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/ApplicationAdapter.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/ApplicationAdapter.java index 3e45b11f94..65480b5007 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/ApplicationAdapter.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/ApplicationAdapter.java @@ -19,7 +19,7 @@ public class ApplicationAdapter extends ClientAdapter implements ApplicationMode protected ApplicationModel updated; protected CachedApplication cached; - public ApplicationAdapter(RealmModel cachedRealm, CachedApplication cached, CacheModelProvider cacheSession, RealmCache cache) { + public ApplicationAdapter(RealmModel cachedRealm, CachedApplication cached, CacheRealmProvider cacheSession, RealmCache cache) { super(cachedRealm, cached, cache, cacheSession); this.cached = cached; } diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheModelProvider.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheRealmProvider.java similarity index 71% rename from model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheModelProvider.java rename to model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheRealmProvider.java index 70e961ceea..dc8a75ba11 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheModelProvider.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheRealmProvider.java @@ -1,13 +1,13 @@ package org.keycloak.models.cache; -import org.keycloak.models.ModelProvider; +import org.keycloak.models.RealmProvider; /** * @author Bill Burke * @version $Revision: 1 $ */ -public interface CacheModelProvider extends ModelProvider { - ModelProvider getDelegate(); +public interface CacheRealmProvider extends RealmProvider { + RealmProvider getDelegate(); void registerRealmInvalidation(String id); diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheModelProviderFactory.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheRealmProviderFactory.java similarity index 65% rename from model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheModelProviderFactory.java rename to model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheRealmProviderFactory.java index 7c0461cc5b..af84c7ba01 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheModelProviderFactory.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheRealmProviderFactory.java @@ -6,6 +6,6 @@ import org.keycloak.provider.ProviderFactory; * @author Bill Burke * @version $Revision: 1 $ */ -public interface CacheModelProviderFactory extends ProviderFactory { +public interface CacheRealmProviderFactory extends ProviderFactory { } diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheModelProviderSpi.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheRealmProviderSpi.java similarity index 70% rename from model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheModelProviderSpi.java rename to model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheRealmProviderSpi.java index 3e912650cb..f6bbfd5742 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheModelProviderSpi.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/CacheRealmProviderSpi.java @@ -8,20 +8,20 @@ import org.keycloak.provider.Spi; * @author Bill Burke * @version $Revision: 1 $ */ -public class CacheModelProviderSpi implements Spi { +public class CacheRealmProviderSpi implements Spi { @Override public String getName() { - return "modelCache"; + return "realmCache"; } @Override public Class getProviderClass() { - return CacheModelProvider.class; + return CacheRealmProvider.class; } @Override public Class getProviderFactoryClass() { - return CacheModelProviderFactory.class; + return CacheRealmProviderFactory.class; } } diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/ClientAdapter.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/ClientAdapter.java index c07e3cb48e..ae913a112c 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/ClientAdapter.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/ClientAdapter.java @@ -15,12 +15,12 @@ import java.util.Set; */ public abstract class ClientAdapter implements ClientModel { protected CachedClient cachedClient; - protected CacheModelProvider cacheSession; + protected CacheRealmProvider cacheSession; protected ClientModel updatedClient; protected RealmModel cachedRealm; protected RealmCache cache; - public ClientAdapter(RealmModel cachedRealm, CachedClient cached, RealmCache cache, CacheModelProvider cacheSession) { + public ClientAdapter(RealmModel cachedRealm, CachedClient cached, RealmCache cache, CacheRealmProvider cacheSession) { this.cachedRealm = cachedRealm; this.cache = cache; this.cacheSession = cacheSession; diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/DefaultCacheModelProvider.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/DefaultCacheRealmProvider.java similarity index 94% rename from model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/DefaultCacheModelProvider.java rename to model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/DefaultCacheRealmProvider.java index 247a7978ae..c4af844528 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/DefaultCacheModelProvider.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/DefaultCacheRealmProvider.java @@ -3,7 +3,7 @@ package org.keycloak.models.cache; import org.keycloak.models.ApplicationModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakTransaction; -import org.keycloak.models.ModelProvider; +import org.keycloak.models.RealmProvider; import org.keycloak.models.OAuthClientModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; @@ -25,10 +25,10 @@ import java.util.Set; * @author Bill Burke * @version $Revision: 1 $ */ -public class DefaultCacheModelProvider implements CacheModelProvider { +public class DefaultCacheRealmProvider implements CacheRealmProvider { protected RealmCache cache; protected KeycloakSession session; - protected ModelProvider delegate; + protected RealmProvider delegate; protected boolean transactionActive; protected boolean setRollbackOnly; @@ -45,7 +45,7 @@ public class DefaultCacheModelProvider implements CacheModelProvider { protected boolean clearAll; - public DefaultCacheModelProvider(RealmCache cache, KeycloakSession session) { + public DefaultCacheRealmProvider(RealmCache cache, KeycloakSession session) { this.cache = cache; this.session = session; @@ -53,10 +53,10 @@ public class DefaultCacheModelProvider implements CacheModelProvider { } @Override - public ModelProvider getDelegate() { + public RealmProvider getDelegate() { if (!transactionActive) throw new IllegalStateException("Cannot access delegate without a transaction"); if (delegate != null) return delegate; - delegate = session.getProvider(ModelProvider.class); + delegate = session.getProvider(RealmProvider.class); return delegate; } diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/MemoryCacheModelProviderFactory.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/MemoryCacheRealmProviderFactory.java similarity index 70% rename from model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/MemoryCacheModelProviderFactory.java rename to model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/MemoryCacheRealmProviderFactory.java index 8a79e79e6e..b37901dbc8 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/MemoryCacheModelProviderFactory.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/MemoryCacheRealmProviderFactory.java @@ -7,12 +7,12 @@ import org.keycloak.models.KeycloakSession; * @author Bill Burke * @version $Revision: 1 $ */ -public class MemoryCacheModelProviderFactory implements CacheModelProviderFactory { +public class MemoryCacheRealmProviderFactory implements CacheRealmProviderFactory { protected RealmCache cache = new MemoryRealmCache(); @Override - public CacheModelProvider create(KeycloakSession session) { - return new DefaultCacheModelProvider(cache, session); + public CacheRealmProvider create(KeycloakSession session) { + return new DefaultCacheRealmProvider(cache, session); } @Override diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/NoCacheModelProvider.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/NoCacheRealmProvider.java similarity index 87% rename from model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/NoCacheModelProvider.java rename to model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/NoCacheRealmProvider.java index 4ef60fa641..c4c71316ea 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/NoCacheModelProvider.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/NoCacheRealmProvider.java @@ -2,7 +2,7 @@ package org.keycloak.models.cache; import org.keycloak.models.ApplicationModel; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ModelProvider; +import org.keycloak.models.RealmProvider; import org.keycloak.models.OAuthClientModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; @@ -13,22 +13,22 @@ import java.util.List; * @author Bill Burke * @version $Revision: 1 $ */ -public class NoCacheModelProvider implements CacheModelProvider { +public class NoCacheRealmProvider implements CacheRealmProvider { protected KeycloakSession session; - protected ModelProvider delegate; + protected RealmProvider delegate; // protected KeycloakTransaction transactionDelegate; // protected boolean transactionActive; // protected boolean setRollbackOnly; - public NoCacheModelProvider(KeycloakSession session) { + public NoCacheRealmProvider(KeycloakSession session) { this.session = session; } @Override - public ModelProvider getDelegate() { + public RealmProvider getDelegate() { // if (!transactionActive) throw new IllegalStateException("Cannot access delegate without a transaction"); if (delegate != null) return delegate; - delegate = session.getProvider(ModelProvider.class); + delegate = session.getProvider(RealmProvider.class); // transactionDelegate = delegate.getTransaction(); // if (!transactionDelegate.isActive()) { // transactionDelegate.begin(); diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/NoCacheModelProviderFactory.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/NoCacheRealmProviderFactory.java similarity index 74% rename from model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/NoCacheModelProviderFactory.java rename to model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/NoCacheRealmProviderFactory.java index db8b1d748d..68b6f35140 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/NoCacheModelProviderFactory.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/NoCacheRealmProviderFactory.java @@ -7,10 +7,10 @@ import org.keycloak.models.KeycloakSession; * @author Bill Burke * @version $Revision: 1 $ */ -public class NoCacheModelProviderFactory implements CacheModelProviderFactory { +public class NoCacheRealmProviderFactory implements CacheRealmProviderFactory { @Override - public CacheModelProvider create(KeycloakSession session) { - return new NoCacheModelProvider(session); + public CacheRealmProvider create(KeycloakSession session) { + return new NoCacheRealmProvider(session); } @Override diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/OAuthClientAdapter.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/OAuthClientAdapter.java index 37e55439f9..50708b917e 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/OAuthClientAdapter.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/OAuthClientAdapter.java @@ -12,7 +12,7 @@ public class OAuthClientAdapter extends ClientAdapter implements OAuthClientMode protected OAuthClientModel updated; protected CachedOAuthClient cached; - public OAuthClientAdapter(RealmModel cachedRealm, CachedOAuthClient cached, CacheModelProvider cacheSession, RealmCache cache) { + public OAuthClientAdapter(RealmModel cachedRealm, CachedOAuthClient cached, CacheRealmProvider cacheSession, RealmCache cache) { super(cachedRealm, cached, cache, cacheSession); this.cached = cached; } diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/RealmAdapter.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/RealmAdapter.java index 7ef235f414..94121a027b 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/RealmAdapter.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/RealmAdapter.java @@ -31,13 +31,13 @@ import java.util.Set; */ public class RealmAdapter implements RealmModel { protected CachedRealm cached; - protected CacheModelProvider cacheSession; + protected CacheRealmProvider cacheSession; protected RealmModel updated; protected RealmCache cache; protected volatile transient PublicKey publicKey; protected volatile transient PrivateKey privateKey; - public RealmAdapter(CachedRealm cached, CacheModelProvider cacheSession) { + public RealmAdapter(CachedRealm cached, CacheRealmProvider cacheSession) { this.cached = cached; this.cacheSession = cacheSession; } diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/RoleAdapter.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/RoleAdapter.java index ea8ce6aaf7..18f642241f 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/RoleAdapter.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/RoleAdapter.java @@ -20,10 +20,10 @@ public class RoleAdapter implements RoleModel { protected RoleModel updated; protected CachedRole cached; protected RealmCache cache; - protected CacheModelProvider cacheSession; + protected CacheRealmProvider cacheSession; protected RealmModel realm; - public RoleAdapter(CachedRole cached, RealmCache cache, CacheModelProvider session, RealmModel realm) { + public RoleAdapter(CachedRole cached, RealmCache cache, CacheRealmProvider session, RealmModel realm) { this.cached = cached; this.cache = cache; this.cacheSession = session; diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/UserAdapter.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/UserAdapter.java index 879dcf9a47..a094b64b53 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/UserAdapter.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/UserAdapter.java @@ -258,7 +258,7 @@ public class UserAdapter implements UserModel { if (updated != null) return updated.getRoleMappings(); Set roles = new HashSet(); for (String id : cached.getRoleMappings()) { - RoleModel roleById = keycloakSession.model().getRoleById(id, realm); + RoleModel roleById = keycloakSession.realms().getRoleById(id, realm); if (roleById == null) { // chance that role was removed, so just delete to persistence and get user invalidated getDelegateForUpdate(); diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedApplication.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedApplication.java index 9f78a04320..3ccacbf51a 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedApplication.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedApplication.java @@ -1,7 +1,7 @@ package org.keycloak.models.cache.entities; import org.keycloak.models.ApplicationModel; -import org.keycloak.models.ModelProvider; +import org.keycloak.models.RealmProvider; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.cache.RealmCache; @@ -23,7 +23,7 @@ public class CachedApplication extends CachedClient { private boolean bearerOnly; private Map roles = new HashMap(); - public CachedApplication(RealmCache cache, ModelProvider delegate, RealmModel realm, ApplicationModel model) { + public CachedApplication(RealmCache cache, RealmProvider delegate, RealmModel realm, ApplicationModel model) { super(cache, delegate, realm, model); surrogateAuthRequired = model.isSurrogateAuthRequired(); managementUrl = model.getManagementUrl(); diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedClient.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedClient.java index 46a98c7f67..feabb452c2 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedClient.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedClient.java @@ -1,7 +1,7 @@ package org.keycloak.models.cache.entities; import org.keycloak.models.ClientModel; -import org.keycloak.models.ModelProvider; +import org.keycloak.models.RealmProvider; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.cache.RealmCache; @@ -26,7 +26,7 @@ public class CachedClient { protected Set scope = new HashSet(); protected Set webOrigins = new HashSet(); - public CachedClient(RealmCache cache, ModelProvider delegate, RealmModel realm, ClientModel model) { + public CachedClient(RealmCache cache, RealmProvider delegate, RealmModel realm, ClientModel model) { id = model.getId(); secret = model.getSecret(); name = model.getClientId(); diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedOAuthClient.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedOAuthClient.java index 00ab503a31..0ab872af3f 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedOAuthClient.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedOAuthClient.java @@ -1,6 +1,6 @@ package org.keycloak.models.cache.entities; -import org.keycloak.models.ModelProvider; +import org.keycloak.models.RealmProvider; import org.keycloak.models.OAuthClientModel; import org.keycloak.models.RealmModel; import org.keycloak.models.cache.RealmCache; @@ -10,7 +10,7 @@ import org.keycloak.models.cache.RealmCache; * @version $Revision: 1 $ */ public class CachedOAuthClient extends CachedClient { - public CachedOAuthClient(RealmCache cache, ModelProvider delegate, RealmModel realm, OAuthClientModel model) { + public CachedOAuthClient(RealmCache cache, RealmProvider delegate, RealmModel realm, OAuthClientModel model) { super(cache, delegate, realm, model); } diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedRealm.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedRealm.java index 132d2cb8df..9bb18ae6f9 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedRealm.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedRealm.java @@ -2,7 +2,7 @@ package org.keycloak.models.cache.entities; import org.keycloak.models.ApplicationModel; import org.keycloak.models.AuthenticationProviderModel; -import org.keycloak.models.ModelProvider; +import org.keycloak.models.RealmProvider; import org.keycloak.models.OAuthClientModel; import org.keycloak.models.PasswordPolicy; import org.keycloak.models.RealmModel; @@ -80,7 +80,7 @@ public class CachedRealm { public CachedRealm() { } - public CachedRealm(RealmCache cache, ModelProvider delegate, RealmModel model) { + public CachedRealm(RealmCache cache, RealmProvider delegate, RealmModel model) { id = model.getId(); name = model.getName(); enabled = model.isEnabled(); diff --git a/model/invalidation-cache/model-adapters/src/main/resources/META-INF/services/org.keycloak.models.cache.CacheModelProviderFactory b/model/invalidation-cache/model-adapters/src/main/resources/META-INF/services/org.keycloak.models.cache.CacheModelProviderFactory deleted file mode 100755 index 7e3ca5dd39..0000000000 --- a/model/invalidation-cache/model-adapters/src/main/resources/META-INF/services/org.keycloak.models.cache.CacheModelProviderFactory +++ /dev/null @@ -1,2 +0,0 @@ -org.keycloak.models.cache.MemoryCacheModelProviderFactory -org.keycloak.models.cache.NoCacheModelProviderFactory \ No newline at end of file diff --git a/model/invalidation-cache/model-adapters/src/main/resources/META-INF/services/org.keycloak.models.cache.CacheRealmProviderFactory b/model/invalidation-cache/model-adapters/src/main/resources/META-INF/services/org.keycloak.models.cache.CacheRealmProviderFactory new file mode 100755 index 0000000000..82ddea9f73 --- /dev/null +++ b/model/invalidation-cache/model-adapters/src/main/resources/META-INF/services/org.keycloak.models.cache.CacheRealmProviderFactory @@ -0,0 +1,2 @@ +org.keycloak.models.cache.MemoryCacheRealmProviderFactory +org.keycloak.models.cache.NoCacheRealmProviderFactory \ No newline at end of file diff --git a/model/invalidation-cache/model-adapters/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/model/invalidation-cache/model-adapters/src/main/resources/META-INF/services/org.keycloak.provider.Spi index 20a4503a9d..d793d8aba1 100755 --- a/model/invalidation-cache/model-adapters/src/main/resources/META-INF/services/org.keycloak.provider.Spi +++ b/model/invalidation-cache/model-adapters/src/main/resources/META-INF/services/org.keycloak.provider.Spi @@ -1,2 +1,2 @@ -org.keycloak.models.cache.CacheModelProviderSpi +org.keycloak.models.cache.CacheRealmProviderSpi org.keycloak.models.cache.CacheUserProviderSpi \ No newline at end of file diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaModelProvider.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProvider.java similarity index 93% rename from model/jpa/src/main/java/org/keycloak/models/jpa/JpaModelProvider.java rename to model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProvider.java index 18ee5994d6..a80485b594 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaModelProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProvider.java @@ -2,7 +2,7 @@ package org.keycloak.models.jpa; import org.keycloak.models.ApplicationModel; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ModelProvider; +import org.keycloak.models.RealmProvider; import org.keycloak.models.OAuthClientModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; @@ -22,11 +22,11 @@ import java.util.List; * @author Bill Burke * @version $Revision: 1 $ */ -public class JpaModelProvider implements ModelProvider { +public class JpaRealmProvider implements RealmProvider { private final KeycloakSession session; protected EntityManager em; - public JpaModelProvider(KeycloakSession session, EntityManager em) { + public JpaRealmProvider(KeycloakSession session, EntityManager em) { this.session = session; this.em = em; } diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaModelProviderFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProviderFactory.java similarity index 67% rename from model/jpa/src/main/java/org/keycloak/models/jpa/JpaModelProviderFactory.java rename to model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProviderFactory.java index bbd8e74ac6..7e090c2142 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaModelProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProviderFactory.java @@ -3,8 +3,8 @@ package org.keycloak.models.jpa; import org.keycloak.Config; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ModelProvider; -import org.keycloak.models.ModelProviderFactory; +import org.keycloak.models.RealmProvider; +import org.keycloak.models.RealmProviderFactory; import javax.persistence.EntityManager; @@ -12,7 +12,7 @@ import javax.persistence.EntityManager; * @author Bill Burke * @version $Revision: 1 $ */ -public class JpaModelProviderFactory implements ModelProviderFactory { +public class JpaRealmProviderFactory implements RealmProviderFactory { @Override public void init(Config.Scope config) { @@ -24,9 +24,9 @@ public class JpaModelProviderFactory implements ModelProviderFactory { } @Override - public ModelProvider create(KeycloakSession session) { + public RealmProvider create(KeycloakSession session) { EntityManager em = session.getProvider(JpaConnectionProvider.class).getEntityManager(); - return new JpaModelProvider(session, em); + return new JpaRealmProvider(session, em); } @Override diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java index b9addbd161..6157ee9f6a 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java @@ -554,7 +554,7 @@ public class RealmAdapter implements RealmModel { @Override public ApplicationModel getApplicationById(String id) { - return session.model().getApplicationById(id, this); + return session.realms().getApplicationById(id, this); } @Override @@ -624,7 +624,7 @@ public class RealmAdapter implements RealmModel { @Override public OAuthClientModel getOAuthClientById(String id) { - return session.model().getOAuthClientById(id, this); + return session.realms().getOAuthClientById(id, this); } @@ -785,7 +785,7 @@ public class RealmAdapter implements RealmModel { @Override public RoleModel getRoleById(String id) { - return session.model().getRoleById(id, this); + return session.realms().getRoleById(id, this); } @Override diff --git a/model/jpa/src/main/resources/META-INF/services/org.keycloak.models.ModelProviderFactory b/model/jpa/src/main/resources/META-INF/services/org.keycloak.models.ModelProviderFactory deleted file mode 100644 index d981d8c615..0000000000 --- a/model/jpa/src/main/resources/META-INF/services/org.keycloak.models.ModelProviderFactory +++ /dev/null @@ -1 +0,0 @@ -org.keycloak.models.jpa.JpaModelProviderFactory \ No newline at end of file diff --git a/model/jpa/src/main/resources/META-INF/services/org.keycloak.models.RealmProviderFactory b/model/jpa/src/main/resources/META-INF/services/org.keycloak.models.RealmProviderFactory new file mode 100755 index 0000000000..8c7cf3980f --- /dev/null +++ b/model/jpa/src/main/resources/META-INF/services/org.keycloak.models.RealmProviderFactory @@ -0,0 +1 @@ +org.keycloak.models.jpa.JpaRealmProviderFactory \ No newline at end of file diff --git a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/ClientAdapter.java b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/ClientAdapter.java index 66cf49d4c2..1e468bcd6d 100755 --- a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/ClientAdapter.java +++ b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/ClientAdapter.java @@ -4,7 +4,7 @@ import org.keycloak.connections.mongo.api.MongoIdentifiableEntity; import org.keycloak.connections.mongo.api.context.MongoStoreInvocationContext; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ModelProvider; +import org.keycloak.models.RealmProvider; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.entities.ClientEntity; @@ -24,14 +24,14 @@ public abstract class ClientAdapter extends A protected final T clientEntity; private final RealmModel realm; protected KeycloakSession session; - private final ModelProvider model; + private final RealmProvider model; public ClientAdapter(KeycloakSession session, RealmModel realm, T clientEntity, MongoStoreInvocationContext invContext) { super(invContext); this.clientEntity = clientEntity; this.realm = realm; this.session = session; - this.model = session.model(); + this.model = session.realms(); } @Override diff --git a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MongoModelProvider.java b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MongoRealmProvider.java similarity index 94% rename from model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MongoModelProvider.java rename to model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MongoRealmProvider.java index f03f099d85..a025e89ae2 100755 --- a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MongoModelProvider.java +++ b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MongoRealmProvider.java @@ -7,7 +7,7 @@ import org.keycloak.connections.mongo.api.MongoStore; import org.keycloak.connections.mongo.api.context.MongoStoreInvocationContext; import org.keycloak.models.ApplicationModel; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ModelProvider; +import org.keycloak.models.RealmProvider; import org.keycloak.models.OAuthClientModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; @@ -23,13 +23,13 @@ import java.util.List; /** * @author Marek Posolda */ -public class MongoModelProvider implements ModelProvider { +public class MongoRealmProvider implements RealmProvider { private final MongoStoreInvocationContext invocationContext; private final KeycloakSession session; private final MongoStore mongoStore; - public MongoModelProvider(KeycloakSession session, MongoStore mongoStore, MongoStoreInvocationContext invocationContext) { + public MongoRealmProvider(KeycloakSession session, MongoStore mongoStore, MongoStoreInvocationContext invocationContext) { this.session = session; this.mongoStore = mongoStore; this.invocationContext = invocationContext; diff --git a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MongoModelProviderFactory.java b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MongoRealmProviderFactory.java similarity index 69% rename from model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MongoModelProviderFactory.java rename to model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MongoRealmProviderFactory.java index cb9c1e20dc..fceeb82ae9 100755 --- a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MongoModelProviderFactory.java +++ b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MongoRealmProviderFactory.java @@ -4,16 +4,16 @@ import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.connections.mongo.MongoConnectionProvider; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ModelProvider; -import org.keycloak.models.ModelProviderFactory; +import org.keycloak.models.RealmProvider; +import org.keycloak.models.RealmProviderFactory; /** * KeycloakSessionFactory implementation based on MongoDB * * @author Marek Posolda */ -public class MongoModelProviderFactory implements ModelProviderFactory { - protected static final Logger logger = Logger.getLogger(MongoModelProviderFactory.class); +public class MongoRealmProviderFactory implements RealmProviderFactory { + protected static final Logger logger = Logger.getLogger(MongoRealmProviderFactory.class); @Override public String getId() { @@ -25,9 +25,9 @@ public class MongoModelProviderFactory implements ModelProviderFactory { } @Override - public ModelProvider create(KeycloakSession session) { + public RealmProvider create(KeycloakSession session) { MongoConnectionProvider connection = session.getProvider(MongoConnectionProvider.class); - return new MongoModelProvider(session, connection.getMongoStore(), connection.getInvocationContext()); + return new MongoRealmProvider(session, connection.getMongoStore(), connection.getInvocationContext()); } @Override diff --git a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java index b0fc75ee6a..410bc9fa8c 100755 --- a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java +++ b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java @@ -9,7 +9,7 @@ import org.keycloak.models.AuthenticationProviderModel; import org.keycloak.models.ClientModel; import org.keycloak.models.CredentialValidation; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ModelProvider; +import org.keycloak.models.RealmProvider; import org.keycloak.models.OAuthClientModel; import org.keycloak.models.PasswordPolicy; import org.keycloak.models.RealmModel; @@ -46,7 +46,7 @@ public class RealmAdapter extends AbstractMongoAdapter impleme private static final Logger logger = Logger.getLogger(RealmAdapter.class); private final MongoRealmEntity realm; - private final ModelProvider model; + private final RealmProvider model; protected volatile transient PublicKey publicKey; protected volatile transient PrivateKey privateKey; @@ -58,7 +58,7 @@ public class RealmAdapter extends AbstractMongoAdapter impleme super(invocationContext); this.realm = realmEntity; this.session = session; - this.model = session.model(); + this.model = session.realms(); } @Override diff --git a/model/mongo/src/main/resources/META-INF/services/org.keycloak.models.ModelProviderFactory b/model/mongo/src/main/resources/META-INF/services/org.keycloak.models.ModelProviderFactory deleted file mode 100644 index 429cc08242..0000000000 --- a/model/mongo/src/main/resources/META-INF/services/org.keycloak.models.ModelProviderFactory +++ /dev/null @@ -1 +0,0 @@ -org.keycloak.models.mongo.keycloak.adapters.MongoModelProviderFactory \ No newline at end of file diff --git a/model/mongo/src/main/resources/META-INF/services/org.keycloak.models.RealmProviderFactory b/model/mongo/src/main/resources/META-INF/services/org.keycloak.models.RealmProviderFactory new file mode 100755 index 0000000000..deffafadfe --- /dev/null +++ b/model/mongo/src/main/resources/META-INF/services/org.keycloak.models.RealmProviderFactory @@ -0,0 +1 @@ +org.keycloak.models.mongo.keycloak.adapters.MongoRealmProviderFactory \ No newline at end of file diff --git a/model/tests/src/test/java/org/keycloak/model/test/AbstractModelTest.java b/model/tests/src/test/java/org/keycloak/model/test/AbstractModelTest.java index 0d85abf076..0779fe54ef 100755 --- a/model/tests/src/test/java/org/keycloak/model/test/AbstractModelTest.java +++ b/model/tests/src/test/java/org/keycloak/model/test/AbstractModelTest.java @@ -8,7 +8,7 @@ import org.junit.BeforeClass; import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.ModelProvider; +import org.keycloak.models.RealmProvider; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.representations.idm.RealmRepresentation; @@ -31,7 +31,7 @@ public class AbstractModelTest { protected KeycloakSession session; protected RealmManager realmManager; - protected ModelProvider model; + protected RealmProvider model; @BeforeClass public static void beforeClass() { @@ -56,7 +56,7 @@ public class AbstractModelTest { public void before() throws Exception { session = sessionFactory.create(); session.getTransaction().begin(); - model = session.model(); + model = session.realms(); realmManager = new RealmManager(session); } @@ -68,7 +68,7 @@ public class AbstractModelTest { session = sessionFactory.create(); try { session.getTransaction().begin(); - model = session.model(); + model = session.realms(); RealmManager rm = new RealmManager(session); for (RealmModel realm : model.getRealms()) { @@ -106,7 +106,7 @@ public class AbstractModelTest { session = sessionFactory.create(); session.getTransaction().begin(); - model = session.model(); + model = session.realms(); realmManager = new RealmManager(session); } diff --git a/server/src/main/resources/META-INF/keycloak-server.json b/server/src/main/resources/META-INF/keycloak-server.json index 6bf6d88e6d..7c6d9f894f 100755 --- a/server/src/main/resources/META-INF/keycloak-server.json +++ b/server/src/main/resources/META-INF/keycloak-server.json @@ -10,7 +10,7 @@ } }, - "model": { + "realm": { "provider": "jpa" }, @@ -22,8 +22,8 @@ "provider" : "${keycloak.userSessions.provider:mem}" }, - "modelCache": { - "provider": "${keycloak.model.cache.provider:mem}" + "realmCache": { + "provider": "${keycloak.realm.cache.provider:mem}" }, "userCache": { diff --git a/services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java b/services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java index b6b0040926..8aae6b4895 100755 --- a/services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java +++ b/services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java @@ -2,10 +2,10 @@ package org.keycloak.services; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakTransactionManager; -import org.keycloak.models.ModelProvider; +import org.keycloak.models.RealmProvider; import org.keycloak.models.UserProvider; import org.keycloak.models.UserSessionProvider; -import org.keycloak.models.cache.CacheModelProvider; +import org.keycloak.models.cache.CacheRealmProvider; import org.keycloak.models.cache.CacheUserProvider; import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderFactory; @@ -23,7 +23,7 @@ public class DefaultKeycloakSession implements KeycloakSession { private final DefaultKeycloakSessionFactory factory; private final Map providers = new HashMap(); private final DefaultKeycloakTransactionManager transactionManager; - private ModelProvider model; + private RealmProvider model; private UserProvider userModel; private UserSessionProvider sessionProvider; @@ -32,11 +32,11 @@ public class DefaultKeycloakSession implements KeycloakSession { this.transactionManager = new DefaultKeycloakTransactionManager(); } - private ModelProvider getModelProvider() { - if (factory.getDefaultProvider(CacheModelProvider.class) != null) { - return getProvider(CacheModelProvider.class); + private RealmProvider getModelProvider() { + if (factory.getDefaultProvider(CacheRealmProvider.class) != null) { + return getProvider(CacheRealmProvider.class); } else { - return getProvider(ModelProvider.class); + return getProvider(RealmProvider.class); } } @@ -93,7 +93,7 @@ public class DefaultKeycloakSession implements KeycloakSession { } @Override - public ModelProvider model() { + public RealmProvider realms() { if (model == null) { model = getModelProvider(); } diff --git a/services/src/main/java/org/keycloak/services/managers/ApplianceBootstrap.java b/services/src/main/java/org/keycloak/services/managers/ApplianceBootstrap.java index 63c01bc5b2..8f5490ff1c 100755 --- a/services/src/main/java/org/keycloak/services/managers/ApplianceBootstrap.java +++ b/services/src/main/java/org/keycloak/services/managers/ApplianceBootstrap.java @@ -40,7 +40,7 @@ public class ApplianceBootstrap { public void bootstrap(KeycloakSession session, String contextPath) { String adminRealmName = Config.getAdminRealm(); - if (session.model().getRealm(adminRealmName) != null) { + if (session.realms().getRealm(adminRealmName) != null) { return; } diff --git a/services/src/main/java/org/keycloak/services/managers/BruteForceProtector.java b/services/src/main/java/org/keycloak/services/managers/BruteForceProtector.java index 69fdab164b..3dab8308b8 100755 --- a/services/src/main/java/org/keycloak/services/managers/BruteForceProtector.java +++ b/services/src/main/java/org/keycloak/services/managers/BruteForceProtector.java @@ -128,7 +128,7 @@ public class BruteForceProtector implements Runnable { } protected RealmModel getRealmModel(KeycloakSession session, LoginEvent event) { - RealmModel realm = session.model().getRealm(event.realmId); + RealmModel realm = session.realms().getRealm(event.realmId); if (realm == null) return null; return realm; } diff --git a/services/src/main/java/org/keycloak/services/managers/RealmManager.java b/services/src/main/java/org/keycloak/services/managers/RealmManager.java index 595d4a3cf1..b5d4dd5650 100755 --- a/services/src/main/java/org/keycloak/services/managers/RealmManager.java +++ b/services/src/main/java/org/keycloak/services/managers/RealmManager.java @@ -8,7 +8,7 @@ import org.keycloak.models.AdminRoles; import org.keycloak.models.ApplicationModel; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ModelProvider; +import org.keycloak.models.RealmProvider; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; @@ -32,7 +32,7 @@ public class RealmManager { protected static final Logger logger = Logger.getLogger(RealmManager.class); protected KeycloakSession session; - protected ModelProvider model; + protected RealmProvider model; protected String contextPath = ""; public String getContextPath() { @@ -45,7 +45,7 @@ public class RealmManager { public RealmManager(KeycloakSession session) { this.session = session; - this.model = session.model(); + this.model = session.realms(); } public KeycloakSession getSession() { diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java b/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java index e9c5a1081a..327c36e5a4 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java @@ -224,7 +224,7 @@ public class AdminConsole { } private void addMasterRealmAccess(RealmModel masterRealm, UserModel user, Map> realmAdminAccess) { - List realms = session.model().getRealms(); + List realms = session.realms().getRealms(); for (RealmModel realm : realms) { ApplicationModel realmAdminApp = realm.getMasterAdminApp(); Set roles = realmAdminApp.getRoles(); diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java index e7d7046891..ab703ac467 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java @@ -85,7 +85,7 @@ public class RealmsAdminResource { RealmManager realmManager = new RealmManager(session); List reps = new ArrayList(); if (auth.getRealm().equals(realmManager.getKeycloakAdminstrationRealm())) { - List realms = session.model().getRealms(); + List realms = session.realms().getRealms(); for (RealmModel realm : realms) { addRealmRep(reps, realm, realm.getMasterAdminApp()); } diff --git a/services/src/main/java/org/keycloak/services/scheduled/ClearExpiredAuditEvents.java b/services/src/main/java/org/keycloak/services/scheduled/ClearExpiredAuditEvents.java old mode 100644 new mode 100755 index 425342ba97..193589c046 --- a/services/src/main/java/org/keycloak/services/scheduled/ClearExpiredAuditEvents.java +++ b/services/src/main/java/org/keycloak/services/scheduled/ClearExpiredAuditEvents.java @@ -13,7 +13,7 @@ public class ClearExpiredAuditEvents implements ScheduledTask { public void run(KeycloakSession session) { AuditProvider audit = session.getProvider(AuditProvider.class); if (audit != null) { - for (RealmModel realm : session.model().getRealms()) { + for (RealmModel realm : session.realms().getRealms()) { if (realm.isAuditEnabled() && realm.getAuditExpiration() > 0) { long olderThan = System.currentTimeMillis() - realm.getAuditExpiration() * 1000; audit.clear(realm.getId(), olderThan); diff --git a/services/src/main/java/org/keycloak/services/scheduled/ClearExpiredUserSessions.java b/services/src/main/java/org/keycloak/services/scheduled/ClearExpiredUserSessions.java index e5f1d1c570..96c8baded6 100755 --- a/services/src/main/java/org/keycloak/services/scheduled/ClearExpiredUserSessions.java +++ b/services/src/main/java/org/keycloak/services/scheduled/ClearExpiredUserSessions.java @@ -12,7 +12,7 @@ public class ClearExpiredUserSessions implements ScheduledTask { @Override public void run(KeycloakSession session) { UserSessionProvider sessions = session.sessions(); - for (RealmModel realm : session.model().getRealms()) { + for (RealmModel realm : session.realms().getRealms()) { sessions.removeExpiredUserSessions(realm); } } diff --git a/testsuite/integration/src/main/resources/META-INF/keycloak-server.json b/testsuite/integration/src/main/resources/META-INF/keycloak-server.json index 9c4ac8562b..1c8ff161bc 100755 --- a/testsuite/integration/src/main/resources/META-INF/keycloak-server.json +++ b/testsuite/integration/src/main/resources/META-INF/keycloak-server.json @@ -7,8 +7,8 @@ "provider": "${keycloak.audit.provider,keycloak.model.provider:jpa}" }, - "model": { - "provider": "${keycloak.model.provider:jpa}" + "realm": { + "provider": "${keycloak.realm.provider:jpa}" }, "user": { @@ -19,8 +19,8 @@ "provider" : "${keycloak.userSessions.provider:mem}" }, - "modelCache": { - "provider": "${keycloak.model.cache.provider:mem}" + "realmCache": { + "provider": "${keycloak.realm.cache.provider:mem}" }, "userCache": { diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTest.java index 41e3916582..f43d735059 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTest.java @@ -231,7 +231,7 @@ public class AdapterTest { Assert.assertTrue(pageSource.contains("Bill Burke") && pageSource.contains("Stian Thorgersen")); KeycloakSession session = keycloakRule.startSession(); - RealmModel realm = session.model().getRealmByName("demo"); + RealmModel realm = session.realms().getRealmByName("demo"); int originalIdle = realm.getSsoSessionIdleTimeout(); realm.setSsoSessionIdleTimeout(1); session.getTransaction().commit(); @@ -245,7 +245,7 @@ public class AdapterTest { Assert.assertTrue(driver.getCurrentUrl().startsWith(LOGIN_URL)); session = keycloakRule.startSession(); - realm = session.model().getRealmByName("demo"); + realm = session.realms().getRealmByName("demo"); realm.setSsoSessionIdleTimeout(originalIdle); session.getTransaction().commit(); session.close(); @@ -265,7 +265,7 @@ public class AdapterTest { Assert.assertTrue(pageSource.contains("Bill Burke") && pageSource.contains("Stian Thorgersen")); KeycloakSession session = keycloakRule.startSession(); - RealmModel realm = session.model().getRealmByName("demo"); + RealmModel realm = session.realms().getRealmByName("demo"); int originalIdle = realm.getSsoSessionIdleTimeout(); realm.setSsoSessionIdleTimeout(1); session.getTransaction().commit(); @@ -274,7 +274,7 @@ public class AdapterTest { Thread.sleep(2000); session = keycloakRule.startSession(); - realm = session.model().getRealmByName("demo"); + realm = session.realms().getRealmByName("demo"); session.sessions().removeExpiredUserSessions(realm); session.getTransaction().commit(); session.close(); @@ -284,7 +284,7 @@ public class AdapterTest { Assert.assertTrue(driver.getCurrentUrl().startsWith(LOGIN_URL)); session = keycloakRule.startSession(); - realm = session.model().getRealmByName("demo"); + realm = session.realms().getRealmByName("demo"); realm.setSsoSessionIdleTimeout(originalIdle); session.getTransaction().commit(); session.close(); @@ -304,7 +304,7 @@ public class AdapterTest { Assert.assertTrue(pageSource.contains("Bill Burke") && pageSource.contains("Stian Thorgersen")); KeycloakSession session = keycloakRule.startSession(); - RealmModel realm = session.model().getRealmByName("demo"); + RealmModel realm = session.realms().getRealmByName("demo"); int original = realm.getSsoSessionMaxLifespan(); realm.setSsoSessionMaxLifespan(1); session.getTransaction().commit(); @@ -318,7 +318,7 @@ public class AdapterTest { Assert.assertTrue(driver.getCurrentUrl().startsWith(LOGIN_URL)); session = keycloakRule.startSession(); - realm = session.model().getRealmByName("demo"); + realm = session.realms().getRealmByName("demo"); realm.setSsoSessionMaxLifespan(original); session.getTransaction().commit(); session.close(); diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java index 548b5ef4c8..339bb17515 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java @@ -1,30 +1,5 @@ package org.keycloak.testsuite.exportimport; -import java.io.File; -import java.util.Properties; - -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.rules.ExternalResource; -import org.junit.rules.RuleChain; -import org.junit.rules.TestRule; -import org.keycloak.Config; -import org.keycloak.exportimport.ExportImportConfig; -import org.keycloak.exportimport.dir.DirExportProvider; -import org.keycloak.exportimport.dir.DirExportProviderFactory; -import org.keycloak.exportimport.singlefile.SingleFileExportProviderFactory; -import org.keycloak.exportimport.zip.ZipExportProviderFactory; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ModelProvider; -import org.keycloak.models.RealmModel; -import org.keycloak.models.UserCredentialModel; -import org.keycloak.models.UserModel; -import org.keycloak.models.UserProvider; -import org.keycloak.representations.idm.CredentialRepresentation; -import org.keycloak.services.managers.RealmManager; -import org.keycloak.testsuite.rule.KeycloakRule; - /** * @author Marek Posolda */ diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java index 6219764816..b032c41fd0 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java @@ -36,7 +36,7 @@ public class UserSessionProviderTest { @Before public void before() { session = kc.startSession(); - realm = session.model().getRealm("test"); + realm = session.realms().getRealm("test"); session.users().addUser(realm, "user1"); session.users().addUser(realm, "user2"); } @@ -174,7 +174,7 @@ public class UserSessionProviderTest { private void resetSession() { kc.stopSession(session, true); session = kc.startSession(); - realm = session.model().getRealm("test"); + realm = session.realms().getRealm("test"); } public void assertSessions(List actualSessions, UserSessionModel... expectedSessions) { diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java index d9cdac3655..a0203b0625 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java @@ -183,7 +183,7 @@ public class RefreshTokenTest { String refreshId = oauth.verifyRefreshToken(tokenResponse.getRefreshToken()).getId(); KeycloakSession session = keycloakRule.startSession(); - RealmModel realm = session.model().getRealmByName("test"); + RealmModel realm = session.realms().getRealmByName("test"); UserSessionModel userSession = session.sessions().getUserSession(realm, sessionId); int last = userSession.getLastSessionRefresh(); session.getTransaction().commit(); @@ -199,7 +199,7 @@ public class RefreshTokenTest { Assert.assertEquals(200, tokenResponse.getStatusCode()); session = keycloakRule.startSession(); - realm = session.model().getRealmByName("test"); + realm = session.realms().getRealmByName("test"); userSession = session.sessions().getUserSession(realm, sessionId); int next = userSession.getLastSessionRefresh(); session.getTransaction().commit(); @@ -211,7 +211,7 @@ public class RefreshTokenTest { session = keycloakRule.startSession(); - realm = session.model().getRealmByName("test"); + realm = session.realms().getRealmByName("test"); int lastAccessTokenLifespan = realm.getAccessTokenLifespan(); realm.setAccessTokenLifespan(100000); session.getTransaction().commit(); @@ -221,7 +221,7 @@ public class RefreshTokenTest { tokenResponse = oauth.doRefreshTokenRequest(tokenResponse.getRefreshToken(), "password"); session = keycloakRule.startSession(); - realm = session.model().getRealmByName("test"); + realm = session.realms().getRealmByName("test"); userSession = session.sessions().getUserSession(realm, sessionId); next = userSession.getLastSessionRefresh(); session.getTransaction().commit(); @@ -231,7 +231,7 @@ public class RefreshTokenTest { Assert.assertThat(next, allOf(greaterThan(last), lessThan(last + 6))); session = keycloakRule.startSession(); - realm = session.model().getRealmByName("test"); + realm = session.realms().getRealmByName("test"); int originalIdle = realm.getSsoSessionIdleTimeout(); realm.setSsoSessionIdleTimeout(1); session.getTransaction().commit(); @@ -249,7 +249,7 @@ public class RefreshTokenTest { events.expectRefresh(refreshId, sessionId).error(Errors.INVALID_TOKEN); session = keycloakRule.startSession(); - realm = session.model().getRealmByName("test"); + realm = session.realms().getRealmByName("test"); realm.setSsoSessionIdleTimeout(originalIdle); realm.setAccessTokenLifespan(lastAccessTokenLifespan); session.getTransaction().commit(); @@ -274,7 +274,7 @@ public class RefreshTokenTest { String refreshId = oauth.verifyRefreshToken(tokenResponse.getRefreshToken()).getId(); KeycloakSession session = keycloakRule.startSession(); - RealmModel realm = session.model().getRealmByName("test"); + RealmModel realm = session.realms().getRealmByName("test"); int maxLifespan = realm.getSsoSessionMaxLifespan(); realm.setSsoSessionMaxLifespan(1); session.getTransaction().commit(); @@ -289,7 +289,7 @@ public class RefreshTokenTest { assertNull(tokenResponse.getRefreshToken()); session = keycloakRule.startSession(); - realm = session.model().getRealmByName("test"); + realm = session.realms().getRealmByName("test"); realm.setSsoSessionMaxLifespan(maxLifespan); session.getTransaction().commit(); session.close(); diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/AbstractKeycloakRule.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/AbstractKeycloakRule.java index 3bcbe61ae2..b313d70d51 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/AbstractKeycloakRule.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/AbstractKeycloakRule.java @@ -40,7 +40,7 @@ public abstract class AbstractKeycloakRule extends ExternalResource { KeycloakSession session = server.getSessionFactory().create(); session.getTransaction().begin(); try { - RealmModel realmByName = session.model().getRealmByName(realm); + RealmModel realmByName = session.realms().getRealmByName(realm); UserModel user = session.users().getUserByUsername(name, realmByName); return user != null ? ModelToRepresentation.toRepresentation(user) : null; } finally { @@ -52,7 +52,7 @@ public abstract class AbstractKeycloakRule extends ExternalResource { KeycloakSession session = server.getSessionFactory().create(); session.getTransaction().begin(); try { - RealmModel realmByName = session.model().getRealmByName(realm); + RealmModel realmByName = session.realms().getRealmByName(realm); return ModelToRepresentation.toRepresentation(session.users().getUserById(id, realmByName)); } finally { session.close(); diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java index 65395bef37..1e30a4b028 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java @@ -100,7 +100,7 @@ public class KeycloakRule extends AbstractKeycloakRule { public void removeUserSession(String sessionId) { KeycloakSession session = startSession(); - RealmModel realm = session.model().getRealm("test"); + RealmModel realm = session.realms().getRealm("test"); UserSessionModel userSession = session.sessions().getUserSession(realm, sessionId); assertNotNull(userSession); session.sessions().removeUserSession(realm, userSession); diff --git a/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/BaseJMeterPerformanceTest.java b/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/BaseJMeterPerformanceTest.java index eb532dfcad..ab6dcbe1c4 100755 --- a/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/BaseJMeterPerformanceTest.java +++ b/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/BaseJMeterPerformanceTest.java @@ -40,7 +40,7 @@ public class BaseJMeterPerformanceTest extends AbstractJavaSamplerClient { try { String adminRealmName = Config.getAdminRealm(); - if (keycloakSession.model().getRealm(adminRealmName) == null) { + if (keycloakSession.realms().getRealm(adminRealmName) == null) { RealmManager manager = new RealmManager(keycloakSession); manager.setContextPath(contextPath); diff --git a/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/CreateUsersWorker.java b/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/CreateUsersWorker.java index c9ca90ebf2..48e5672ea8 100755 --- a/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/CreateUsersWorker.java +++ b/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/CreateUsersWorker.java @@ -58,7 +58,7 @@ public class CreateUsersWorker implements Worker { @Override public void run(SampleResult result, KeycloakSession session) { // We need to obtain realm first - RealmModel realm = session.model().getRealm(realmId); + RealmModel realm = session.realms().getRealm(realmId); if (realm == null) { throw new IllegalStateException("Realm '" + realmId + "' not found"); } diff --git a/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/ReadUsersWorker.java b/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/ReadUsersWorker.java index 53c324275a..a858767c60 100755 --- a/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/ReadUsersWorker.java +++ b/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/ReadUsersWorker.java @@ -67,7 +67,7 @@ public class ReadUsersWorker implements Worker { @Override public void run(SampleResult result, KeycloakSession session) { // We need to obtain realm first - RealmModel realm = session.model().getRealm(realmId); + RealmModel realm = session.realms().getRealm(realmId); if (realm == null) { throw new IllegalStateException("Realm '" + realmId + "' not found"); } diff --git a/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/RemoveUsersWorker.java b/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/RemoveUsersWorker.java index 7012d4967d..915ded9d52 100755 --- a/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/RemoveUsersWorker.java +++ b/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/RemoveUsersWorker.java @@ -32,7 +32,7 @@ public class RemoveUsersWorker implements Worker { int realmNumber = realmsOffset + workerId; String realmId = PerfTestUtils.getRealmName(realmNumber); - realm = session.model().getRealm(realmId); + realm = session.realms().getRealm(realmId); if (realm == null) { throw new IllegalStateException("Realm '" + realmId + "' not found"); } diff --git a/testsuite/tools/src/main/java/org/keycloak/test/tools/PerfTools.java b/testsuite/tools/src/main/java/org/keycloak/test/tools/PerfTools.java index 504fba3b03..51ff6f3fc7 100755 --- a/testsuite/tools/src/main/java/org/keycloak/test/tools/PerfTools.java +++ b/testsuite/tools/src/main/java/org/keycloak/test/tools/PerfTools.java @@ -2,7 +2,6 @@ package org.keycloak.test.tools; import org.keycloak.exportimport.ExportImportConfig; import org.keycloak.exportimport.ExportImportManager; -import org.keycloak.exportimport.ExportProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; @@ -11,14 +10,12 @@ import org.keycloak.test.tools.jobs.DeleteUsersJob; import org.keycloak.test.tools.jobs.UpdateUsersJob; import org.keycloak.test.tools.jobs.UsersJob; import org.keycloak.test.tools.jobs.UsersJobInitializer; -import org.keycloak.util.ProviderLoader; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; -import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; @@ -171,7 +168,7 @@ public class PerfTools { } private int getUsersCount(String realmName, String prefix) { - RealmModel realm = session.model().getRealmByName(realmName); + RealmModel realm = session.realms().getRealmByName(realmName); // TODO: method for count on model if (prefix == null) {