rename ModelProvider->RealmProvider

2014-07-15 15:44:50 -04:00
1 parent 484a4c1454
commit a5593469ae
@@ -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;
    }
@@ -1,13 +1,13 @@
 package org.keycloak.models.cache;

-import org.keycloak.models.ModelProvider;
+import org.keycloak.models.RealmProvider;

 /**
 * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
 * @version $Revision: 1 $
 */
-public interface CacheModelProvider extends ModelProvider {
-    ModelProvider getDelegate();
+public interface CacheRealmProvider extends RealmProvider {
+    RealmProvider getDelegate();

    void registerRealmInvalidation(String id);

@@ -6,6 +6,6 @@ import org.keycloak.provider.ProviderFactory;
 * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
 * @version $Revision: 1 $
 */
-public interface CacheModelProviderFactory extends ProviderFactory<CacheModelProvider> {
+public interface CacheRealmProviderFactory extends ProviderFactory<CacheRealmProvider> {

 }
@@ -8,20 +8,20 @@ import org.keycloak.provider.Spi;
 * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
 * @version $Revision: 1 $
 */
-public class CacheModelProviderSpi implements Spi {
+public class CacheRealmProviderSpi implements Spi {

    @Override
    public String getName() {
-        return "modelCache";
+        return "realmCache";
    }

    @Override
    public Class<? extends Provider> getProviderClass() {
-        return CacheModelProvider.class;
+        return CacheRealmProvider.class;
    }

    @Override
    public Class<? extends ProviderFactory> getProviderFactoryClass() {
-        return CacheModelProviderFactory.class;
+        return CacheRealmProviderFactory.class;
    }
 }
@@ -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;
@@ -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 <a href="mailto:bill@burkecentral.com">Bill Burke</a>
 * @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;
    }

@@ -7,12 +7,12 @@ import org.keycloak.models.KeycloakSession;
 * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
 * @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
@@ -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 <a href="mailto:bill@burkecentral.com">Bill Burke</a>
 * @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();
@@ -7,10 +7,10 @@ import org.keycloak.models.KeycloakSession;
 * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
 * @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
@@ -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;
    }
@@ -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;
    }
@@ -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;
@@ -258,7 +258,7 @@ public class UserAdapter implements UserModel {
        if (updated != null) return updated.getRoleMappings();
        Set<RoleModel> roles = new HashSet<RoleModel>();
        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();
@@ -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<String, String> roles = new HashMap<String, String>();

-    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();
@@ -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<String> scope = new HashSet<String>();
    protected Set<String> webOrigins = new HashSet<String>();

-    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();
@@ -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);

    }
@@ -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();
@@ -1,2 +0,0 @@
-org.keycloak.models.cache.MemoryCacheModelProviderFactory
-org.keycloak.models.cache.NoCacheModelProviderFactory
@@ -0,0 +1,2 @@
+org.keycloak.models.cache.MemoryCacheRealmProviderFactory
+org.keycloak.models.cache.NoCacheRealmProviderFactory
@@ -1,2 +1,2 @@
-org.keycloak.models.cache.CacheModelProviderSpi
+org.keycloak.models.cache.CacheRealmProviderSpi
 org.keycloak.models.cache.CacheUserProviderSpi