keycloak-uncached

diff --git a/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanPublicKeyStorageProvider.java b/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanPublicKeyStorageProvider.java
index 230baec..b59ef70 100644
--- a/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanPublicKeyStorageProvider.java
+++ b/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanPublicKeyStorageProvider.java
@@ -34,7 +34,7 @@ import org.keycloak.keys.PublicKeyLoader;
 import org.keycloak.keys.PublicKeyStorageProvider;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.KeycloakTransaction;
-import org.keycloak.models.cache.infinispan.ClearCacheEvent;
+// import org.keycloak.models.cache.infinispan.ClearCacheEvent;
 
 
 /**
@@ -64,12 +64,12 @@ public class InfinispanPublicKeyStorageProvider implements PublicKeyStorageProvi
     }
 
 
-    @Override
-    public void clearCache() {
-        keys.clear();
-        ClusterProvider cluster = session.getProvider(ClusterProvider.class);
-        cluster.notify(InfinispanPublicKeyStorageProviderFactory.KEYS_CLEAR_CACHE_EVENTS, new ClearCacheEvent(), true, ClusterProvider.DCNotify.ALL_DCS);
-    }
+    // @Override
+    // public void clearCache() {
+    //     keys.clear();
+    //     ClusterProvider cluster = session.getProvider(ClusterProvider.class);
+    //     cluster.notify(InfinispanPublicKeyStorageProviderFactory.KEYS_CLEAR_CACHE_EVENTS, new ClearCacheEvent(), true, ClusterProvider.DCNotify.ALL_DCS);
+    // }
 
 
     void addInvalidation(String cacheKey) {

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PermissionTicketListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PermissionTicketListQuery.java
index d8c397c..f971981 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PermissionTicketListQuery.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PermissionTicketListQuery.java
@@ -1,42 +1,42 @@
-package org.keycloak.models.cache.infinispan.authorization.entities;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned;
-
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class PermissionTicketListQuery extends AbstractRevisioned implements PermissionTicketQuery {
-
-    private final Set<String> permissions;
-    private final String serverId;
-
-    public PermissionTicketListQuery(Long revision, String id, String permissionId, String serverId) {
-        super(revision, id);
-        this.serverId = serverId;
-        permissions = new HashSet<>();
-        permissions.add(permissionId);
-    }
-    public PermissionTicketListQuery(Long revision, String id, Set<String> permissions, String serverId) {
-        super(revision, id);
-        this.serverId = serverId;
-        this.permissions = permissions;
-    }
-
-    @Override
-    public String getResourceServerId() {
-        return serverId;
-    }
-
-    public Set<String> getPermissions() {
-        return permissions;
-    }
-
-    @Override
-    public boolean isInvalid(Set<String> invalidations) {
-        return invalidations.contains(getId()) || invalidations.contains(getResourceServerId());
-    }
-}
\ No newline at end of file
+// package org.keycloak.models.cache.infinispan.authorization.entities;
+
+// import java.util.HashSet;
+// import java.util.Set;
+
+// import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned;
+
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class PermissionTicketListQuery extends AbstractRevisioned implements PermissionTicketQuery {
+
+//     private final Set<String> permissions;
+//     private final String serverId;
+
+//     public PermissionTicketListQuery(Long revision, String id, String permissionId, String serverId) {
+//         super(revision, id);
+//         this.serverId = serverId;
+//         permissions = new HashSet<>();
+//         permissions.add(permissionId);
+//     }
+//     public PermissionTicketListQuery(Long revision, String id, Set<String> permissions, String serverId) {
+//         super(revision, id);
+//         this.serverId = serverId;
+//         this.permissions = permissions;
+//     }
+
+//     @Override
+//     public String getResourceServerId() {
+//         return serverId;
+//     }
+
+//     public Set<String> getPermissions() {
+//         return permissions;
+//     }
+
+//     @Override
+//     public boolean isInvalid(Set<String> invalidations) {
+//         return invalidations.contains(getId()) || invalidations.contains(getResourceServerId());
+//     }
+// }
\ No newline at end of file

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PermissionTicketResourceListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PermissionTicketResourceListQuery.java
index 3165854..0678236 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PermissionTicketResourceListQuery.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PermissionTicketResourceListQuery.java
@@ -14,29 +14,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.keycloak.models.cache.infinispan.authorization.entities;
+// package org.keycloak.models.cache.infinispan.authorization.entities;
 
-import java.util.Set;
+// import java.util.Set;
 
-/**
- * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
- */
-public class PermissionTicketResourceListQuery extends PermissionTicketListQuery implements InResource {
+// /**
+//  * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
+//  */
+// public class PermissionTicketResourceListQuery extends PermissionTicketListQuery implements InResource {
 
-    private final String resourceId;
+//     private final String resourceId;
 
-    public PermissionTicketResourceListQuery(Long revision, String id, String resourceId, Set<String> permissions, String serverId) {
-        super(revision, id, permissions, serverId);
-        this.resourceId = resourceId;
-    }
+//     public PermissionTicketResourceListQuery(Long revision, String id, String resourceId, Set<String> permissions, String serverId) {
+//         super(revision, id, permissions, serverId);
+//         this.resourceId = resourceId;
+//     }
 
-    @Override
-    public boolean isInvalid(Set<String> invalidations) {
-        return super.isInvalid(invalidations) || invalidations.contains(getResourceId());
-    }
+//     @Override
+//     public boolean isInvalid(Set<String> invalidations) {
+//         return super.isInvalid(invalidations) || invalidations.contains(getResourceId());
+//     }
 
-    @Override
-    public String getResourceId() {
-        return resourceId;
-    }
-}
\ No newline at end of file
+//     @Override
+//     public String getResourceId() {
+//         return resourceId;
+//     }
+// }
\ No newline at end of file

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PermissionTicketScopeListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PermissionTicketScopeListQuery.java
index ff3743e..8dabadb 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PermissionTicketScopeListQuery.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PermissionTicketScopeListQuery.java
@@ -14,29 +14,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.keycloak.models.cache.infinispan.authorization.entities;
+// package org.keycloak.models.cache.infinispan.authorization.entities;
 
-import java.util.Set;
+// import java.util.Set;
 
-/**
- * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
- */
-public class PermissionTicketScopeListQuery extends PermissionTicketListQuery implements InScope {
+// /**
+//  * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
+//  */
+// public class PermissionTicketScopeListQuery extends PermissionTicketListQuery implements InScope {
 
-    private final String scopeId;
+//     private final String scopeId;
 
-    public PermissionTicketScopeListQuery(Long revision, String id, String scopeId, Set<String> permissions, String serverId) {
-        super(revision, id, permissions, serverId);
-        this.scopeId = scopeId;
-    }
+//     public PermissionTicketScopeListQuery(Long revision, String id, String scopeId, Set<String> permissions, String serverId) {
+//         super(revision, id, permissions, serverId);
+//         this.scopeId = scopeId;
+//     }
 
-    @Override
-    public boolean isInvalid(Set<String> invalidations) {
-        return super.isInvalid(invalidations) || invalidations.contains(getScopeId());
-    }
+//     @Override
+//     public boolean isInvalid(Set<String> invalidations) {
+//         return super.isInvalid(invalidations) || invalidations.contains(getScopeId());
+//     }
 
-    @Override
-    public String getScopeId() {
-        return scopeId;
-    }
-}
\ No newline at end of file
+//     @Override
+//     public String getScopeId() {
+//         return scopeId;
+//     }
+// }
\ No newline at end of file

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PolicyListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PolicyListQuery.java
index 0b2227a..15707d3 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PolicyListQuery.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PolicyListQuery.java
@@ -1,41 +1,41 @@
-package org.keycloak.models.cache.infinispan.authorization.entities;
+// package org.keycloak.models.cache.infinispan.authorization.entities;
 
-import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned;
+// import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned;
 
-import java.util.HashSet;
-import java.util.Set;
+// import java.util.HashSet;
+// import java.util.Set;
 
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class PolicyListQuery extends AbstractRevisioned implements PolicyQuery {
-    private final Set<String> policies;
-    private final String serverId;
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class PolicyListQuery extends AbstractRevisioned implements PolicyQuery {
+//     private final Set<String> policies;
+//     private final String serverId;
 
-    public PolicyListQuery(Long revision, String id, String policyId, String serverId) {
-        super(revision, id);
-        this.serverId = serverId;
-        policies = new HashSet<>();
-        policies.add(policyId);
-    }
-    public PolicyListQuery(Long revision, String id, Set<String> policies, String serverId) {
-        super(revision, id);
-        this.serverId = serverId;
-        this.policies = policies;
-    }
+//     public PolicyListQuery(Long revision, String id, String policyId, String serverId) {
+//         super(revision, id);
+//         this.serverId = serverId;
+//         policies = new HashSet<>();
+//         policies.add(policyId);
+//     }
+//     public PolicyListQuery(Long revision, String id, Set<String> policies, String serverId) {
+//         super(revision, id);
+//         this.serverId = serverId;
+//         this.policies = policies;
+//     }
 
-    @Override
-    public String getResourceServerId() {
-        return serverId;
-    }
+//     @Override
+//     public String getResourceServerId() {
+//         return serverId;
+//     }
 
-    public Set<String> getPolicies() {
-        return policies;
-    }
+//     public Set<String> getPolicies() {
+//         return policies;
+//     }
 
-    @Override
-    public boolean isInvalid(Set<String> invalidations) {
-        return invalidations.contains(getId()) || invalidations.contains(getResourceServerId());
-    }
-}
\ No newline at end of file
+//     @Override
+//     public boolean isInvalid(Set<String> invalidations) {
+//         return invalidations.contains(getId()) || invalidations.contains(getResourceServerId());
+//     }
+// }
\ No newline at end of file

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PolicyResourceListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PolicyResourceListQuery.java
index d0af77b..fbc2b59 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PolicyResourceListQuery.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PolicyResourceListQuery.java
@@ -1,42 +1,42 @@
-/*
- * Copyright 2017 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.keycloak.models.cache.infinispan.authorization.entities;
+// /*
+//  * Copyright 2017 Red Hat, Inc. and/or its affiliates
+//  * and other contributors as indicated by the @author tags.
+//  *
+//  * Licensed under the Apache License, Version 2.0 (the "License");
+//  * you may not use this file except in compliance with the License.
+//  * You may obtain a copy of the License at
+//  *
+//  * http://www.apache.org/licenses/LICENSE-2.0
+//  *
+//  * Unless required by applicable law or agreed to in writing, software
+//  * distributed under the License is distributed on an "AS IS" BASIS,
+//  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  * See the License for the specific language governing permissions and
+//  * limitations under the License.
+//  */
+// package org.keycloak.models.cache.infinispan.authorization.entities;
 
-import java.util.Set;
+// import java.util.Set;
 
-/**
- * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
- */
-public class PolicyResourceListQuery extends PolicyListQuery implements InResource {
+// /**
+//  * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
+//  */
+// public class PolicyResourceListQuery extends PolicyListQuery implements InResource {
 
-    private final String resourceId;
+//     private final String resourceId;
 
-    public PolicyResourceListQuery(Long revision, String id, String resourceId, Set<String> policies, String serverId) {
-        super(revision, id, policies, serverId);
-        this.resourceId = resourceId;
-    }
+//     public PolicyResourceListQuery(Long revision, String id, String resourceId, Set<String> policies, String serverId) {
+//         super(revision, id, policies, serverId);
+//         this.resourceId = resourceId;
+//     }
 
-    @Override
-    public boolean isInvalid(Set<String> invalidations) {
-        return super.isInvalid(invalidations) || invalidations.contains(getResourceId());
-    }
+//     @Override
+//     public boolean isInvalid(Set<String> invalidations) {
+//         return super.isInvalid(invalidations) || invalidations.contains(getResourceId());
+//     }
 
-    @Override
-    public String getResourceId() {
-        return resourceId;
-    }
-}
\ No newline at end of file
+//     @Override
+//     public String getResourceId() {
+//         return resourceId;
+//     }
+// }
\ No newline at end of file

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PolicyScopeListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PolicyScopeListQuery.java
index 7db8a01..8ea6239 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PolicyScopeListQuery.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PolicyScopeListQuery.java
@@ -1,42 +1,42 @@
-/*
- * Copyright 2017 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.keycloak.models.cache.infinispan.authorization.entities;
+// /*
+//  * Copyright 2017 Red Hat, Inc. and/or its affiliates
+//  * and other contributors as indicated by the @author tags.
+//  *
+//  * Licensed under the Apache License, Version 2.0 (the "License");
+//  * you may not use this file except in compliance with the License.
+//  * You may obtain a copy of the License at
+//  *
+//  * http://www.apache.org/licenses/LICENSE-2.0
+//  *
+//  * Unless required by applicable law or agreed to in writing, software
+//  * distributed under the License is distributed on an "AS IS" BASIS,
+//  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  * See the License for the specific language governing permissions and
+//  * limitations under the License.
+//  */
+// package org.keycloak.models.cache.infinispan.authorization.entities;
 
-import java.util.Set;
+// import java.util.Set;
 
-/**
- * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
- */
-public class PolicyScopeListQuery extends PolicyListQuery implements InScope {
+// /**
+//  * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
+//  */
+// public class PolicyScopeListQuery extends PolicyListQuery implements InScope {
 
-    private final String scopeId;
+//     private final String scopeId;
 
-    public PolicyScopeListQuery(Long revision, String id, String scopeId, Set<String> resources, String serverId) {
-        super(revision, id, resources, serverId);
-        this.scopeId = scopeId;
-    }
+//     public PolicyScopeListQuery(Long revision, String id, String scopeId, Set<String> resources, String serverId) {
+//         super(revision, id, resources, serverId);
+//         this.scopeId = scopeId;
+//     }
 
-    @Override
-    public String getScopeId() {
-        return scopeId;
-    }
+//     @Override
+//     public String getScopeId() {
+//         return scopeId;
+//     }
 
-    @Override
-    public boolean isInvalid(Set<String> invalidations) {
-        return super.isInvalid(invalidations) || invalidations.contains(getScopeId());
-    }
-}
\ No newline at end of file
+//     @Override
+//     public boolean isInvalid(Set<String> invalidations) {
+//         return super.isInvalid(invalidations) || invalidations.contains(getScopeId());
+//     }
+// }
\ No newline at end of file

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ResourceListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ResourceListQuery.java
index d8db81b..d788f01 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ResourceListQuery.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ResourceListQuery.java
@@ -1,41 +1,41 @@
-package org.keycloak.models.cache.infinispan.authorization.entities;
+// package org.keycloak.models.cache.infinispan.authorization.entities;
 
-import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned;
+// import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned;
 
-import java.util.HashSet;
-import java.util.Set;
+// import java.util.HashSet;
+// import java.util.Set;
 
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class ResourceListQuery extends AbstractRevisioned implements ResourceQuery, InResourceServer {
-    private final Set<String> resources;
-    private final String serverId;
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class ResourceListQuery extends AbstractRevisioned implements ResourceQuery, InResourceServer {
+//     private final Set<String> resources;
+//     private final String serverId;
 
-    public ResourceListQuery(Long revision, String id, String resourceId, String serverId) {
-        super(revision, id);
-        this.serverId = serverId;
-        resources = new HashSet<>();
-        resources.add(resourceId);
-    }
-    public ResourceListQuery(Long revision, String id, Set<String> resources, String serverId) {
-        super(revision, id);
-        this.serverId = serverId;
-        this.resources = resources;
-    }
+//     public ResourceListQuery(Long revision, String id, String resourceId, String serverId) {
+//         super(revision, id);
+//         this.serverId = serverId;
+//         resources = new HashSet<>();
+//         resources.add(resourceId);
+//     }
+//     public ResourceListQuery(Long revision, String id, Set<String> resources, String serverId) {
+//         super(revision, id);
+//         this.serverId = serverId;
+//         this.resources = resources;
+//     }
 
-    @Override
-    public String getResourceServerId() {
-        return serverId;
-    }
+//     @Override
+//     public String getResourceServerId() {
+//         return serverId;
+//     }
 
-    public Set<String> getResources() {
-        return resources;
-    }
+//     public Set<String> getResources() {
+//         return resources;
+//     }
 
-    @Override
-    public boolean isInvalid(Set<String> invalidations) {
-        return invalidations.contains(getId()) || invalidations.contains(getResourceServerId());
-    }
-}
\ No newline at end of file
+//     @Override
+//     public boolean isInvalid(Set<String> invalidations) {
+//         return invalidations.contains(getId()) || invalidations.contains(getResourceServerId());
+//     }
+// }
\ No newline at end of file

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ResourceScopeListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ResourceScopeListQuery.java
index ee73344..77cc6a5 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ResourceScopeListQuery.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ResourceScopeListQuery.java
@@ -1,26 +1,26 @@
-package org.keycloak.models.cache.infinispan.authorization.entities;
+// package org.keycloak.models.cache.infinispan.authorization.entities;
 
-import java.util.Set;
+// import java.util.Set;
 
-/**
- * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
- */
-public class ResourceScopeListQuery extends ResourceListQuery implements InScope {
+// /**
+//  * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
+//  */
+// public class ResourceScopeListQuery extends ResourceListQuery implements InScope {
 
-    private final String scopeId;
+//     private final String scopeId;
 
-    public ResourceScopeListQuery(Long revision, String id, String scopeId, Set<String> resources, String serverId) {
-        super(revision, id, resources, serverId);
-        this.scopeId = scopeId;
-    }
+//     public ResourceScopeListQuery(Long revision, String id, String scopeId, Set<String> resources, String serverId) {
+//         super(revision, id, resources, serverId);
+//         this.scopeId = scopeId;
+//     }
 
-    @Override
-    public String getScopeId() {
-        return scopeId;
-    }
+//     @Override
+//     public String getScopeId() {
+//         return scopeId;
+//     }
 
-    @Override
-    public boolean isInvalid(Set<String> invalidations) {
-        return super.isInvalid(invalidations) || invalidations.contains(getScopeId());
-    }
-}
\ No newline at end of file
+//     @Override
+//     public boolean isInvalid(Set<String> invalidations) {
+//         return super.isInvalid(invalidations) || invalidations.contains(getScopeId());
+//     }
+// }
\ No newline at end of file

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ResourceServerListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ResourceServerListQuery.java
index 3c9a348..f4da78d 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ResourceServerListQuery.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ResourceServerListQuery.java
@@ -1,28 +1,28 @@
-package org.keycloak.models.cache.infinispan.authorization.entities;
+// package org.keycloak.models.cache.infinispan.authorization.entities;
 
-import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned;
+// import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned;
 
-import java.util.HashSet;
-import java.util.Set;
+// import java.util.HashSet;
+// import java.util.Set;
 
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class ResourceServerListQuery extends AbstractRevisioned {
-    private final Set<String> servers;
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class ResourceServerListQuery extends AbstractRevisioned {
+//     private final Set<String> servers;
 
-    public ResourceServerListQuery(Long revision, String id, String serverId) {
-        super(revision, id);
-        servers = new HashSet<>();
-        servers.add(serverId);
-    }
-    public ResourceServerListQuery(Long revision, String id, Set<String> servers) {
-        super(revision, id);
-        this.servers = servers;
-    }
+//     public ResourceServerListQuery(Long revision, String id, String serverId) {
+//         super(revision, id);
+//         servers = new HashSet<>();
+//         servers.add(serverId);
+//     }
+//     public ResourceServerListQuery(Long revision, String id, Set<String> servers) {
+//         super(revision, id);
+//         this.servers = servers;
+//     }
 
-    public Set<String> getResourceServers() {
-        return servers;
-    }
-}
\ No newline at end of file
+//     public Set<String> getResourceServers() {
+//         return servers;
+//     }
+// }
\ No newline at end of file

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ScopeListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ScopeListQuery.java
index 2579e61..acf5aee 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ScopeListQuery.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ScopeListQuery.java
@@ -1,36 +1,36 @@
-package org.keycloak.models.cache.infinispan.authorization.entities;
+// package org.keycloak.models.cache.infinispan.authorization.entities;
 
-import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned;
+// import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned;
 
-import java.util.HashSet;
-import java.util.Set;
+// import java.util.HashSet;
+// import java.util.Set;
 
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class ScopeListQuery extends AbstractRevisioned implements InResourceServer {
-    private final Set<String> scopes;
-    private final String serverId;
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class ScopeListQuery extends AbstractRevisioned implements InResourceServer {
+//     private final Set<String> scopes;
+//     private final String serverId;
 
-    public ScopeListQuery(Long revision, String id, String scopeId, String serverId) {
-        super(revision, id);
-        this.serverId = serverId;
-        scopes = new HashSet<>();
-        scopes.add(scopeId);
-    }
-    public ScopeListQuery(Long revision, String id, Set<String> scopes, String serverId) {
-        super(revision, id);
-        this.serverId = serverId;
-        this.scopes = scopes;
-    }
+//     public ScopeListQuery(Long revision, String id, String scopeId, String serverId) {
+//         super(revision, id);
+//         this.serverId = serverId;
+//         scopes = new HashSet<>();
+//         scopes.add(scopeId);
+//     }
+//     public ScopeListQuery(Long revision, String id, Set<String> scopes, String serverId) {
+//         super(revision, id);
+//         this.serverId = serverId;
+//         this.scopes = scopes;
+//     }
 
-    @Override
-    public String getResourceServerId() {
-        return serverId;
-    }
+//     @Override
+//     public String getResourceServerId() {
+//         return serverId;
+//     }
 
-    public Set<String> getScopes() {
-        return scopes;
-    }
-}
\ No newline at end of file
+//     public Set<String> getScopes() {
+//         return scopes;
+//     }
+// }
\ No newline at end of file

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClearCacheEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClearCacheEvent.java
index ccfeef4..8c72b1c 100644
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClearCacheEvent.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClearCacheEvent.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.keycloak.models.cache.infinispan;
+// package org.keycloak.models.cache.infinispan;
 
-import org.keycloak.cluster.ClusterEvent;
+// import org.keycloak.cluster.ClusterEvent;
 
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class ClearCacheEvent implements ClusterEvent {
-}
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class ClearCacheEvent implements ClusterEvent {
+// }

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/AbstractExtendableRevisioned.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/AbstractExtendableRevisioned.java
index 9940732..89e6c2b 100644
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/AbstractExtendableRevisioned.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/AbstractExtendableRevisioned.java
@@ -14,27 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.keycloak.models.cache.infinispan.entities;
+// package org.keycloak.models.cache.infinispan.entities;
 
-import java.util.concurrent.ConcurrentHashMap;
+// import java.util.concurrent.ConcurrentHashMap;
 
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public abstract class AbstractExtendableRevisioned extends AbstractRevisioned {
-    protected ConcurrentHashMap cachedWith = new ConcurrentHashMap();
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public abstract class AbstractExtendableRevisioned extends AbstractRevisioned {
+//     protected ConcurrentHashMap cachedWith = new ConcurrentHashMap();
 
-    public AbstractExtendableRevisioned(Long revision, String id) {
-        super(revision, id);
-    }
+//     public AbstractExtendableRevisioned(Long revision, String id) {
+//         super(revision, id);
+//     }
 
-    /**
-     * Cache things along with this cachable object
-     *
-     * @return
-     */
-    public ConcurrentHashMap getCachedWith() {
-        return cachedWith;
-    }
-}
+//     /**
+//      * Cache things along with this cachable object
+//      *
+//      * @return
+//      */
+//     public ConcurrentHashMap getCachedWith() {
+//         return cachedWith;
+//     }
+// }

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/AbstractRevisioned.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/AbstractRevisioned.java
index bedd1c7..6b3c145 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/AbstractRevisioned.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/AbstractRevisioned.java
@@ -1,48 +1,48 @@
-package org.keycloak.models.cache.infinispan.entities;
-
-import org.keycloak.common.util.Time;
-// import org.keycloak.models.cache.CachedObject;
-
-import java.io.Serializable;
-
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class AbstractRevisioned implements Revisioned, Serializable
-// , CachedObject {
-{
-    private String id;
-    private Long revision;
-    // private final long cacheTimestamp = Time.currentTimeMillis();
-
-    public AbstractRevisioned(Long revision, String id) {
-        this.revision = revision;
-        this.id = id;
-    }
-
-    @Override
-    public String getId() {
-        return id;
-    }
-
-    @Override
-    public Long getRevision() {
-        return revision;
-    }
-
-    @Override
-    public void setRevision(Long revision) {
-        this.revision = revision;
-    }
-
-    /**
-     * When was this cached
-     *
-     * @return
-     */
-    // @Override
-    // public long getCacheTimestamp() {
-    //     return cacheTimestamp;
-    // }
-}
+// package org.keycloak.models.cache.infinispan.entities;
+
+// import org.keycloak.common.util.Time;
+// // import org.keycloak.models.cache.CachedObject;
+
+// import java.io.Serializable;
+
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class AbstractRevisioned implements Revisioned, Serializable
+// // , CachedObject {
+// {
+//     private String id;
+//     private Long revision;
+//     // private final long cacheTimestamp = Time.currentTimeMillis();
+
+//     public AbstractRevisioned(Long revision, String id) {
+//         this.revision = revision;
+//         this.id = id;
+//     }
+
+//     @Override
+//     public String getId() {
+//         return id;
+//     }
+
+//     @Override
+//     public Long getRevision() {
+//         return revision;
+//     }
+
+//     @Override
+//     public void setRevision(Long revision) {
+//         this.revision = revision;
+//     }
+
+//     /**
+//      * When was this cached
+//      *
+//      * @return
+//      */
+//     // @Override
+//     // public long getCacheTimestamp() {
+//     //     return cacheTimestamp;
+//     // }
+// }

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedClientRole.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedClientRole.java
index 1b35672..d2e6dab 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedClientRole.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedClientRole.java
@@ -15,26 +15,26 @@
  * limitations under the License.
  */
 
-package org.keycloak.models.cache.infinispan.entities;
+// package org.keycloak.models.cache.infinispan.entities;
 
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.RoleModel;
+// import org.keycloak.models.RealmModel;
+// import org.keycloak.models.RoleModel;
 
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class CachedClientRole extends CachedRole implements InClient {
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class CachedClientRole extends CachedRole implements InClient {
 
-    private final String clientId;
+//     private final String clientId;
 
-    public CachedClientRole(Long revision, String clientId, RoleModel model, RealmModel realm) {
-        super(revision, model, realm);
-        this.clientId = clientId;
+//     public CachedClientRole(Long revision, String clientId, RoleModel model, RealmModel realm) {
+//         super(revision, model, realm);
+//         this.clientId = clientId;
 
-    }
+//     }
 
-    public String getClientId() {
-        return clientId;
-    }
-}
+//     public String getClientId() {
+//         return clientId;
+//     }
+// }

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedClientScope.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedClientScope.java
index 134bd65..ed32548 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedClientScope.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedClientScope.java
@@ -15,71 +15,71 @@
  * limitations under the License.
  */
 
-package org.keycloak.models.cache.infinispan.entities;
+// package org.keycloak.models.cache.infinispan.entities;
 
-import org.keycloak.models.ClientScopeModel;
-import org.keycloak.models.ProtocolMapperModel;
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.RoleModel;
+// import org.keycloak.models.ClientScopeModel;
+// import org.keycloak.models.ProtocolMapperModel;
+// import org.keycloak.models.RealmModel;
+// import org.keycloak.models.RoleModel;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+// import java.util.HashMap;
+// import java.util.HashSet;
+// import java.util.Map;
+// import java.util.Set;
 
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class CachedClientScope extends AbstractRevisioned implements InRealm {
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class CachedClientScope extends AbstractRevisioned implements InRealm {
 
-    private String name;
-    private String description;
-    private String realm;
-    private String protocol;
-    private Set<String> scope = new HashSet<>();
-    private Set<ProtocolMapperModel> protocolMappers = new HashSet<ProtocolMapperModel>();
-    private Map<String, String> attributes = new HashMap<>();
+//     private String name;
+//     private String description;
+//     private String realm;
+//     private String protocol;
+//     private Set<String> scope = new HashSet<>();
+//     private Set<ProtocolMapperModel> protocolMappers = new HashSet<ProtocolMapperModel>();
+//     private Map<String, String> attributes = new HashMap<>();
 
-    public CachedClientScope(Long revision, RealmModel realm, ClientScopeModel model) {
-        super(revision, model.getId());
-        name = model.getName();
-        description = model.getDescription();
-        this.realm = realm.getId();
-        protocol = model.getProtocol();
-        for (ProtocolMapperModel mapper : model.getProtocolMappers()) {
-            this.protocolMappers.add(mapper);
-        }
-        for (RoleModel role : model.getScopeMappings())  {
-            scope.add(role.getId());
-        }
-        attributes.putAll(model.getAttributes());
-    }
+//     public CachedClientScope(Long revision, RealmModel realm, ClientScopeModel model) {
+//         super(revision, model.getId());
+//         name = model.getName();
+//         description = model.getDescription();
+//         this.realm = realm.getId();
+//         protocol = model.getProtocol();
+//         for (ProtocolMapperModel mapper : model.getProtocolMappers()) {
+//             this.protocolMappers.add(mapper);
+//         }
+//         for (RoleModel role : model.getScopeMappings())  {
+//             scope.add(role.getId());
+//         }
+//         attributes.putAll(model.getAttributes());
+//     }
 
-    public String getName() {
-        return name;
-    }
+//     public String getName() {
+//         return name;
+//     }
 
-    public String getDescription() { return description; }
+//     public String getDescription() { return description; }
 
-    public void setDescription(String description) { this.description = description; }
+//     public void setDescription(String description) { this.description = description; }
 
-    public String getRealm() {
-        return realm;
-    }
-    public Set<ProtocolMapperModel> getProtocolMappers() {
-        return protocolMappers;
-    }
+//     public String getRealm() {
+//         return realm;
+//     }
+//     public Set<ProtocolMapperModel> getProtocolMappers() {
+//         return protocolMappers;
+//     }
 
-    public String getProtocol() {
-        return protocol;
-    }
+//     public String getProtocol() {
+//         return protocol;
+//     }
 
-    public Set<String> getScope() {
-        return scope;
-    }
+//     public Set<String> getScope() {
+//         return scope;
+//     }
 
-    public Map<String, String> getAttributes() {
-        return attributes;
-    }
-}
+//     public Map<String, String> getAttributes() {
+//         return attributes;
+//     }
+// }

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedFederatedIdentityLinks.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedFederatedIdentityLinks.java
index 7959695..d59bceb 100644
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedFederatedIdentityLinks.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedFederatedIdentityLinks.java
@@ -15,37 +15,37 @@
  * limitations under the License.
  */
 
-package org.keycloak.models.cache.infinispan.entities;
-
-import org.keycloak.models.FederatedIdentityModel;
-import org.keycloak.models.RealmModel;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * The cache entry, which contains list of all identityProvider links for particular user. It needs to be updated every time when any
- * federation link is added, removed or updated for the user
- * 
- * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
- */
-public class CachedFederatedIdentityLinks extends AbstractRevisioned implements InRealm {
-
-    private final String realmId;
-    private final Set<FederatedIdentityModel> federatedIdentities = new HashSet<>();
-
-    public CachedFederatedIdentityLinks(Long revision, String id, RealmModel realm, Set<FederatedIdentityModel> federatedIdentities) {
-        super(revision, id);
-        this.realmId = realm.getId();
-        this.federatedIdentities.addAll(federatedIdentities);
-    }
-
-    @Override
-    public String getRealm() {
-        return realmId;
-    }
-
-    public Set<FederatedIdentityModel> getFederatedIdentities() {
-        return federatedIdentities;
-    }
-}
+// package org.keycloak.models.cache.infinispan.entities;
+
+// import org.keycloak.models.FederatedIdentityModel;
+// import org.keycloak.models.RealmModel;
+
+// import java.util.HashSet;
+// import java.util.Set;
+
+// /**
+//  * The cache entry, which contains list of all identityProvider links for particular user. It needs to be updated every time when any
+//  * federation link is added, removed or updated for the user
+//  * 
+//  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+//  */
+// public class CachedFederatedIdentityLinks extends AbstractRevisioned implements InRealm {
+
+//     private final String realmId;
+//     private final Set<FederatedIdentityModel> federatedIdentities = new HashSet<>();
+
+//     public CachedFederatedIdentityLinks(Long revision, String id, RealmModel realm, Set<FederatedIdentityModel> federatedIdentities) {
+//         super(revision, id);
+//         this.realmId = realm.getId();
+//         this.federatedIdentities.addAll(federatedIdentities);
+//     }
+
+//     @Override
+//     public String getRealm() {
+//         return realmId;
+//     }
+
+//     public Set<FederatedIdentityModel> getFederatedIdentities() {
+//         return federatedIdentities;
+//     }
+// }

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedGroup.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedGroup.java
index bf83d27..eb93d1c 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedGroup.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedGroup.java
@@ -15,68 +15,68 @@
  * limitations under the License.
  */
 
-package org.keycloak.models.cache.infinispan.entities;
+// package org.keycloak.models.cache.infinispan.entities;
 
-import org.keycloak.common.util.MultivaluedHashMap;
-import org.keycloak.models.GroupModel;
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.RoleModel;
-import org.keycloak.models.cache.infinispan.DefaultLazyLoader;
-import org.keycloak.models.cache.infinispan.LazyLoader;
+// import org.keycloak.common.util.MultivaluedHashMap;
+// import org.keycloak.models.GroupModel;
+// import org.keycloak.models.RealmModel;
+// import org.keycloak.models.RoleModel;
+// import org.keycloak.models.cache.infinispan.DefaultLazyLoader;
+// import org.keycloak.models.cache.infinispan.LazyLoader;
 
-import java.util.Collections;
-import java.util.Set;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
+// import java.util.Collections;
+// import java.util.Set;
+// import java.util.function.Supplier;
+// import java.util.stream.Collectors;
 
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class CachedGroup extends AbstractRevisioned implements InRealm {
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class CachedGroup extends AbstractRevisioned implements InRealm {
 
-    private final String realm;
-    private final String name;
-    private final String parentId;
-    private final LazyLoader<GroupModel, MultivaluedHashMap<String, String>> attributes;
-    private final LazyLoader<GroupModel, Set<String>> roleMappings;
-    private final LazyLoader<GroupModel, Set<String>> subGroups;
+//     private final String realm;
+//     private final String name;
+//     private final String parentId;
+//     private final LazyLoader<GroupModel, MultivaluedHashMap<String, String>> attributes;
+//     private final LazyLoader<GroupModel, Set<String>> roleMappings;
+//     private final LazyLoader<GroupModel, Set<String>> subGroups;
 
-    public CachedGroup(Long revision, RealmModel realm, GroupModel group) {
-        super(revision, group.getId());
-        this.realm = realm.getId();
-        this.name = group.getName();
-        this.parentId = group.getParentId();
-        this.attributes = new DefaultLazyLoader<>(source -> new MultivaluedHashMap<>(source.getAttributes()), MultivaluedHashMap::new);
-        this.roleMappings = new DefaultLazyLoader<>(source -> source.getRoleMappings().stream().map(RoleModel::getId).collect(Collectors.toSet()), Collections::emptySet);
-        this.subGroups = new DefaultLazyLoader<>(source -> source.getSubGroups().stream().map(GroupModel::getId).collect(Collectors.toSet()), Collections::emptySet);
-    }
+//     public CachedGroup(Long revision, RealmModel realm, GroupModel group) {
+//         super(revision, group.getId());
+//         this.realm = realm.getId();
+//         this.name = group.getName();
+//         this.parentId = group.getParentId();
+//         this.attributes = new DefaultLazyLoader<>(source -> new MultivaluedHashMap<>(source.getAttributes()), MultivaluedHashMap::new);
+//         this.roleMappings = new DefaultLazyLoader<>(source -> source.getRoleMappings().stream().map(RoleModel::getId).collect(Collectors.toSet()), Collections::emptySet);
+//         this.subGroups = new DefaultLazyLoader<>(source -> source.getSubGroups().stream().map(GroupModel::getId).collect(Collectors.toSet()), Collections::emptySet);
+//     }
 
-    public String getRealm() {
-        return realm;
-    }
+//     public String getRealm() {
+//         return realm;
+//     }
 
-    public MultivaluedHashMap<String, String> getAttributes(Supplier<GroupModel> group) {
-        return attributes.get(group);
-    }
+//     public MultivaluedHashMap<String, String> getAttributes(Supplier<GroupModel> group) {
+//         return attributes.get(group);
+//     }
 
-    public Set<String> getRoleMappings(Supplier<GroupModel> group) {
-        // it may happen that groups were not loaded before so we don't actually need to invalidate entries in the cache
-        if (group == null) {
-            return Collections.emptySet();
-        }
-        return roleMappings.get(group);
-    }
+//     public Set<String> getRoleMappings(Supplier<GroupModel> group) {
+//         // it may happen that groups were not loaded before so we don't actually need to invalidate entries in the cache
+//         if (group == null) {
+//             return Collections.emptySet();
+//         }
+//         return roleMappings.get(group);
+//     }
 
-    public String getName() {
-        return name;
-    }
+//     public String getName() {
+//         return name;
+//     }
 
-    public String getParentId() {
-        return parentId;
-    }
+//     public String getParentId() {
+//         return parentId;
+//     }
 
-    public Set<String> getSubGroups(Supplier<GroupModel> group) {
-        return subGroups.get(group);
-    }
-}
+//     public Set<String> getSubGroups(Supplier<GroupModel> group) {
+//         return subGroups.get(group);
+//     }
+// }

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealm.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealm.java
index c2877e1..caede5d 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealm.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealm.java
@@ -15,673 +15,673 @@
  * limitations under the License.
  */
 
-package org.keycloak.models.cache.infinispan.entities;
-
-import org.keycloak.common.enums.SslRequired;
-import org.keycloak.common.util.MultivaluedHashMap;
-import org.keycloak.component.ComponentModel;
-import org.keycloak.models.AuthenticationExecutionModel;
-import org.keycloak.models.AuthenticationFlowModel;
-import org.keycloak.models.AuthenticatorConfigModel;
-import org.keycloak.models.ClientModel;
-import org.keycloak.models.ClientScopeModel;
-import org.keycloak.models.GroupModel;
-import org.keycloak.models.IdentityProviderMapperModel;
-import org.keycloak.models.IdentityProviderModel;
-import org.keycloak.models.OTPPolicy;
-import org.keycloak.models.PasswordPolicy;
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.RequiredActionProviderModel;
-import org.keycloak.models.RequiredCredentialModel;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class CachedRealm extends AbstractExtendableRevisioned {
-
-    protected String name;
-    protected String displayName;
-    protected String displayNameHtml;
-    protected boolean enabled;
-    protected SslRequired sslRequired;
-    protected boolean registrationAllowed;
-    protected boolean registrationEmailAsUsername;
-    protected boolean rememberMe;
-    protected boolean verifyEmail;
-    protected boolean loginWithEmailAllowed;
-    protected boolean duplicateEmailsAllowed;
-    protected boolean resetPasswordAllowed;
-    protected boolean identityFederationEnabled;
-    protected boolean editUsernameAllowed;
-    //--- brute force settings
-    protected boolean bruteForceProtected;
-    protected boolean permanentLockout;
-    protected int maxFailureWaitSeconds;
-    protected int minimumQuickLoginWaitSeconds;
-    protected int waitIncrementSeconds;
-    protected long quickLoginCheckMilliSeconds;
-    protected int maxDeltaTimeSeconds;
-    protected int failureFactor;
-    //--- end brute force settings
-
-    protected String defaultSignatureAlgorithm;
-    protected boolean revokeRefreshToken;
-    protected int refreshTokenMaxReuse;
-    protected int ssoSessionIdleTimeout;
-    protected int ssoSessionMaxLifespan;
-    protected int ssoSessionIdleTimeoutRememberMe;
-    protected int ssoSessionMaxLifespanRememberMe;
-    protected int offlineSessionIdleTimeout;
-    // KEYCLOAK-7688 Offline Session Max for Offline Token
-    protected boolean offlineSessionMaxLifespanEnabled;
-    protected int offlineSessionMaxLifespan;
-    protected int accessTokenLifespan;
-    protected int accessTokenLifespanForImplicitFlow;
-    protected int accessCodeLifespan;
-    protected int accessCodeLifespanUserAction;
-    protected int accessCodeLifespanLogin;
-    protected int actionTokenGeneratedByAdminLifespan;
-    protected int actionTokenGeneratedByUserLifespan;
-    protected int notBefore;
-    protected PasswordPolicy passwordPolicy;
-    protected OTPPolicy otpPolicy;
-
-    protected String loginTheme;
-    protected String accountTheme;
-    protected String adminTheme;
-    protected String emailTheme;
-    protected String masterAdminClient;
-
-    protected List<RequiredCredentialModel> requiredCredentials;
-    protected MultivaluedHashMap<String, ComponentModel> componentsByParent = new MultivaluedHashMap<>();
-    protected MultivaluedHashMap<String, ComponentModel> componentsByParentAndType = new MultivaluedHashMap<>();
-    protected Map<String, ComponentModel> components = new HashMap<>();
-    protected List<IdentityProviderModel> identityProviders;
-
-    protected Map<String, String> browserSecurityHeaders;
-    protected Map<String, String> smtpConfig;
-    protected Map<String, AuthenticationFlowModel> authenticationFlows = new HashMap<>();
-    protected List<AuthenticationFlowModel> authenticationFlowList;
-    protected Map<String, AuthenticatorConfigModel> authenticatorConfigs = new HashMap<>();
-    protected Map<String, RequiredActionProviderModel> requiredActionProviders = new HashMap<>();
-    protected List<RequiredActionProviderModel> requiredActionProviderList;
-    protected Map<String, RequiredActionProviderModel> requiredActionProvidersByAlias = new HashMap<>();
-    protected MultivaluedHashMap<String, AuthenticationExecutionModel> authenticationExecutions = new MultivaluedHashMap<>();
-    protected Map<String, AuthenticationExecutionModel> executionsById = new HashMap<>();
-
-    protected AuthenticationFlowModel browserFlow;
-    protected AuthenticationFlowModel registrationFlow;
-    protected AuthenticationFlowModel directGrantFlow;
-    protected AuthenticationFlowModel resetCredentialsFlow;
-    protected AuthenticationFlowModel clientAuthenticationFlow;
-    protected AuthenticationFlowModel dockerAuthenticationFlow;
-
-    protected boolean eventsEnabled;
-    protected long eventsExpiration;
-    protected Set<String> eventsListeners;
-    protected Set<String> enabledEventTypes;
-    protected boolean adminEventsEnabled;
-    protected Set<String> adminEnabledEventOperations = new HashSet<String>();
-    protected boolean adminEventsDetailsEnabled;
-    protected List<String> defaultRoles;
-    private boolean allowUserManagedAccess;
-
-    public Set<IdentityProviderMapperModel> getIdentityProviderMapperSet() {
-        return identityProviderMapperSet;
-    }
-
-    protected List<String> defaultGroups = new LinkedList<String>();
-    protected List<String> clientScopes = new LinkedList<>();
-    protected List<String> defaultDefaultClientScopes = new LinkedList<>();
-    protected List<String> optionalDefaultClientScopes = new LinkedList<>();
-    protected boolean internationalizationEnabled;
-    protected Set<String> supportedLocales;
-    protected String defaultLocale;
-    protected MultivaluedHashMap<String, IdentityProviderMapperModel> identityProviderMappers = new MultivaluedHashMap<>();
-    protected Set<IdentityProviderMapperModel> identityProviderMapperSet;
-
-    protected Map<String, String> attributes;
-
-    private Map<String, Integer> userActionTokenLifespans;
-
-    public CachedRealm(Long revision, RealmModel model) {
-        super(revision, model.getId());
-        name = model.getName();
-        displayName = model.getDisplayName();
-        displayNameHtml = model.getDisplayNameHtml();
-        enabled = model.isEnabled();
-        allowUserManagedAccess = model.isUserManagedAccessAllowed();
-        sslRequired = model.getSslRequired();
-        registrationAllowed = model.isRegistrationAllowed();
-        registrationEmailAsUsername = model.isRegistrationEmailAsUsername();
-        rememberMe = model.isRememberMe();
-        verifyEmail = model.isVerifyEmail();
-        loginWithEmailAllowed = model.isLoginWithEmailAllowed();
-        duplicateEmailsAllowed = model.isDuplicateEmailsAllowed();
-        resetPasswordAllowed = model.isResetPasswordAllowed();
-        identityFederationEnabled = model.isIdentityFederationEnabled();
-        editUsernameAllowed = model.isEditUsernameAllowed();
-        //--- brute force settings
-        bruteForceProtected = model.isBruteForceProtected();
-        permanentLockout = model.isPermanentLockout();
-        maxFailureWaitSeconds = model.getMaxFailureWaitSeconds();
-        minimumQuickLoginWaitSeconds = model.getMinimumQuickLoginWaitSeconds();
-        waitIncrementSeconds = model.getWaitIncrementSeconds();
-        quickLoginCheckMilliSeconds = model.getQuickLoginCheckMilliSeconds();
-        maxDeltaTimeSeconds = model.getMaxDeltaTimeSeconds();
-        failureFactor = model.getFailureFactor();
-        //--- end brute force settings
-
-        defaultSignatureAlgorithm = model.getDefaultSignatureAlgorithm();
-        revokeRefreshToken = model.isRevokeRefreshToken();
-        refreshTokenMaxReuse = model.getRefreshTokenMaxReuse();
-        ssoSessionIdleTimeout = model.getSsoSessionIdleTimeout();
-        ssoSessionMaxLifespan = model.getSsoSessionMaxLifespan();
-        ssoSessionIdleTimeoutRememberMe = model.getSsoSessionIdleTimeoutRememberMe();
-        ssoSessionMaxLifespanRememberMe = model.getSsoSessionMaxLifespanRememberMe();
-        offlineSessionIdleTimeout = model.getOfflineSessionIdleTimeout();
-        // KEYCLOAK-7688 Offline Session Max for Offline Token
-        offlineSessionMaxLifespanEnabled = model.isOfflineSessionMaxLifespanEnabled();
-        offlineSessionMaxLifespan = model.getOfflineSessionMaxLifespan();
-        accessTokenLifespan = model.getAccessTokenLifespan();
-        accessTokenLifespanForImplicitFlow = model.getAccessTokenLifespanForImplicitFlow();
-        accessCodeLifespan = model.getAccessCodeLifespan();
-        accessCodeLifespanUserAction = model.getAccessCodeLifespanUserAction();
-        accessCodeLifespanLogin = model.getAccessCodeLifespanLogin();
-        actionTokenGeneratedByAdminLifespan = model.getActionTokenGeneratedByAdminLifespan();
-        actionTokenGeneratedByUserLifespan = model.getActionTokenGeneratedByUserLifespan();
-        notBefore = model.getNotBefore();
-        passwordPolicy = model.getPasswordPolicy();
-        otpPolicy = model.getOTPPolicy();
-
-        loginTheme = model.getLoginTheme();
-        accountTheme = model.getAccountTheme();
-        adminTheme = model.getAdminTheme();
-        emailTheme = model.getEmailTheme();
-
-        requiredCredentials = model.getRequiredCredentials();
-        userActionTokenLifespans = Collections.unmodifiableMap(new HashMap<>(model.getUserActionTokenLifespans()));
-
-        this.identityProviders = new ArrayList<>();
-
-        for (IdentityProviderModel identityProviderModel : model.getIdentityProviders()) {
-            this.identityProviders.add(new IdentityProviderModel(identityProviderModel));
-        }
-        this.identityProviders = Collections.unmodifiableList(this.identityProviders);
-
-        this.identityProviderMapperSet = model.getIdentityProviderMappers();
-        for (IdentityProviderMapperModel mapper : identityProviderMapperSet) {
-            identityProviderMappers.add(mapper.getIdentityProviderAlias(), mapper);
-        }
-
-
-
-        smtpConfig = model.getSmtpConfig();
-        browserSecurityHeaders = model.getBrowserSecurityHeaders();
-
-        eventsEnabled = model.isEventsEnabled();
-        eventsExpiration = model.getEventsExpiration();
-        eventsListeners = model.getEventsListeners();
-        enabledEventTypes = model.getEnabledEventTypes();
-
-        adminEventsEnabled = model.isAdminEventsEnabled();
-        adminEventsDetailsEnabled = model.isAdminEventsDetailsEnabled();
-
-        defaultRoles = model.getDefaultRoles();
-        ClientModel masterAdminClient = model.getMasterAdminClient();
-        this.masterAdminClient = (masterAdminClient != null) ? masterAdminClient.getId() : null;
-
-        cacheClientScopes(model);
-
-        internationalizationEnabled = model.isInternationalizationEnabled();
-        supportedLocales = model.getSupportedLocales();
-        defaultLocale = model.getDefaultLocale();
-        authenticationFlowList = model.getAuthenticationFlows();
-        for (AuthenticationFlowModel flow : authenticationFlowList) {
-            this.authenticationFlows.put(flow.getId(), flow);
-            authenticationExecutions.put(flow.getId(), new LinkedList<AuthenticationExecutionModel>());
-            for (AuthenticationExecutionModel execution : model.getAuthenticationExecutions(flow.getId())) {
-                authenticationExecutions.add(flow.getId(), execution);
-                executionsById.put(execution.getId(), execution);
-            }
-        }
-
-        for (AuthenticatorConfigModel authenticator : model.getAuthenticatorConfigs()) {
-            authenticatorConfigs.put(authenticator.getId(), authenticator);
-        }
-        requiredActionProviderList = model.getRequiredActionProviders();
-        for (RequiredActionProviderModel action : requiredActionProviderList) {
-            this.requiredActionProviders.put(action.getId(), action);
-            requiredActionProvidersByAlias.put(action.getAlias(), action);
-        }
-
-        for (GroupModel group : model.getDefaultGroups()) {
-            defaultGroups.add(group.getId());
-        }
-
-        browserFlow = model.getBrowserFlow();
-        registrationFlow = model.getRegistrationFlow();
-        directGrantFlow = model.getDirectGrantFlow();
-        resetCredentialsFlow = model.getResetCredentialsFlow();
-        clientAuthenticationFlow = model.getClientAuthenticationFlow();
-        dockerAuthenticationFlow = model.getDockerAuthenticationFlow();
-
-        for (ComponentModel component : model.getComponents()) {
-            componentsByParentAndType.add(component.getParentId() + component.getProviderType(), component);
-        }
-        for (ComponentModel component : model.getComponents()) {
-            componentsByParent.add(component.getParentId(), component);
-        }
-        for (ComponentModel component : model.getComponents()) {
-            components.put(component.getId(), component);
-        }
-
-        try {
-            attributes = model.getAttributes();
-        } catch (UnsupportedOperationException ex) {
-        }
-
-    }
-
-    protected void cacheClientScopes(RealmModel model) {
-        for (ClientScopeModel clientScope : model.getClientScopes()) {
-            clientScopes.add(clientScope.getId());
-        }
-        for (ClientScopeModel clientScope : model.getDefaultClientScopes(true)) {
-            defaultDefaultClientScopes.add(clientScope.getId());
-        }
-        for (ClientScopeModel clientScope : model.getDefaultClientScopes(false)) {
-            optionalDefaultClientScopes.add(clientScope.getId());
-        }
-    }
-
-    public String getMasterAdminClient() {
-        return masterAdminClient;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    public String getDisplayNameHtml() {
-        return displayNameHtml;
-    }
-
-    public List<String> getDefaultRoles() {
-        return defaultRoles;
-    }
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public SslRequired getSslRequired() {
-        return sslRequired;
-    }
-
-    public boolean isRegistrationAllowed() {
-        return registrationAllowed;
-    }
-
-    public boolean isRegistrationEmailAsUsername() {
-        return registrationEmailAsUsername;
-    }
-
-    public boolean isRememberMe() {
-        return this.rememberMe;
-    }
-
-    public boolean isBruteForceProtected() {
-        return bruteForceProtected;
-    }
-
-    public boolean isPermanentLockout() {
-        return permanentLockout;
-    }
-
-    public int getMaxFailureWaitSeconds() {
-        return this.maxFailureWaitSeconds;
-    }
-
-    public int getWaitIncrementSeconds() {
-        return this.waitIncrementSeconds;
-    }
-
-    public int getMinimumQuickLoginWaitSeconds() {
-        return this.minimumQuickLoginWaitSeconds;
-    }
-
-    public long getQuickLoginCheckMilliSeconds() {
-        return quickLoginCheckMilliSeconds;
-    }
-
-    public int getMaxDeltaTimeSeconds() {
-        return maxDeltaTimeSeconds;
-    }
-
-    public int getFailureFactor() {
-        return failureFactor;
-    }
-
-    public boolean isVerifyEmail() {
-        return verifyEmail;
-    }
+// package org.keycloak.models.cache.infinispan.entities;
+
+// import org.keycloak.common.enums.SslRequired;
+// import org.keycloak.common.util.MultivaluedHashMap;
+// import org.keycloak.component.ComponentModel;
+// import org.keycloak.models.AuthenticationExecutionModel;
+// import org.keycloak.models.AuthenticationFlowModel;
+// import org.keycloak.models.AuthenticatorConfigModel;
+// import org.keycloak.models.ClientModel;
+// import org.keycloak.models.ClientScopeModel;
+// import org.keycloak.models.GroupModel;
+// import org.keycloak.models.IdentityProviderMapperModel;
+// import org.keycloak.models.IdentityProviderModel;
+// import org.keycloak.models.OTPPolicy;
+// import org.keycloak.models.PasswordPolicy;
+// import org.keycloak.models.RealmModel;
+// import org.keycloak.models.RequiredActionProviderModel;
+// import org.keycloak.models.RequiredCredentialModel;
+
+// import java.util.ArrayList;
+// import java.util.Collections;
+// import java.util.HashMap;
+// import java.util.HashSet;
+// import java.util.LinkedList;
+// import java.util.List;
+// import java.util.Map;
+// import java.util.Set;
+
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class CachedRealm extends AbstractExtendableRevisioned {
+
+//     protected String name;
+//     protected String displayName;
+//     protected String displayNameHtml;
+//     protected boolean enabled;
+//     protected SslRequired sslRequired;
+//     protected boolean registrationAllowed;
+//     protected boolean registrationEmailAsUsername;
+//     protected boolean rememberMe;
+//     protected boolean verifyEmail;
+//     protected boolean loginWithEmailAllowed;
+//     protected boolean duplicateEmailsAllowed;
+//     protected boolean resetPasswordAllowed;
+//     protected boolean identityFederationEnabled;
+//     protected boolean editUsernameAllowed;
+//     //--- brute force settings
+//     protected boolean bruteForceProtected;
+//     protected boolean permanentLockout;
+//     protected int maxFailureWaitSeconds;
+//     protected int minimumQuickLoginWaitSeconds;
+//     protected int waitIncrementSeconds;
+//     protected long quickLoginCheckMilliSeconds;
+//     protected int maxDeltaTimeSeconds;
+//     protected int failureFactor;
+//     //--- end brute force settings
+
+//     protected String defaultSignatureAlgorithm;
+//     protected boolean revokeRefreshToken;
+//     protected int refreshTokenMaxReuse;
+//     protected int ssoSessionIdleTimeout;
+//     protected int ssoSessionMaxLifespan;
+//     protected int ssoSessionIdleTimeoutRememberMe;
+//     protected int ssoSessionMaxLifespanRememberMe;
+//     protected int offlineSessionIdleTimeout;
+//     // KEYCLOAK-7688 Offline Session Max for Offline Token
+//     protected boolean offlineSessionMaxLifespanEnabled;
+//     protected int offlineSessionMaxLifespan;
+//     protected int accessTokenLifespan;
+//     protected int accessTokenLifespanForImplicitFlow;
+//     protected int accessCodeLifespan;
+//     protected int accessCodeLifespanUserAction;
+//     protected int accessCodeLifespanLogin;
+//     protected int actionTokenGeneratedByAdminLifespan;
+//     protected int actionTokenGeneratedByUserLifespan;
+//     protected int notBefore;
+//     protected PasswordPolicy passwordPolicy;
+//     protected OTPPolicy otpPolicy;
+
+//     protected String loginTheme;
+//     protected String accountTheme;
+//     protected String adminTheme;
+//     protected String emailTheme;
+//     protected String masterAdminClient;
+
+//     protected List<RequiredCredentialModel> requiredCredentials;
+//     protected MultivaluedHashMap<String, ComponentModel> componentsByParent = new MultivaluedHashMap<>();
+//     protected MultivaluedHashMap<String, ComponentModel> componentsByParentAndType = new MultivaluedHashMap<>();
+//     protected Map<String, ComponentModel> components = new HashMap<>();
+//     protected List<IdentityProviderModel> identityProviders;
+
+//     protected Map<String, String> browserSecurityHeaders;
+//     protected Map<String, String> smtpConfig;
+//     protected Map<String, AuthenticationFlowModel> authenticationFlows = new HashMap<>();
+//     protected List<AuthenticationFlowModel> authenticationFlowList;
+//     protected Map<String, AuthenticatorConfigModel> authenticatorConfigs = new HashMap<>();
+//     protected Map<String, RequiredActionProviderModel> requiredActionProviders = new HashMap<>();
+//     protected List<RequiredActionProviderModel> requiredActionProviderList;
+//     protected Map<String, RequiredActionProviderModel> requiredActionProvidersByAlias = new HashMap<>();
+//     protected MultivaluedHashMap<String, AuthenticationExecutionModel> authenticationExecutions = new MultivaluedHashMap<>();
+//     protected Map<String, AuthenticationExecutionModel> executionsById = new HashMap<>();
+
+//     protected AuthenticationFlowModel browserFlow;
+//     protected AuthenticationFlowModel registrationFlow;
+//     protected AuthenticationFlowModel directGrantFlow;
+//     protected AuthenticationFlowModel resetCredentialsFlow;
+//     protected AuthenticationFlowModel clientAuthenticationFlow;
+//     protected AuthenticationFlowModel dockerAuthenticationFlow;
+
+//     protected boolean eventsEnabled;
+//     protected long eventsExpiration;
+//     protected Set<String> eventsListeners;
+//     protected Set<String> enabledEventTypes;
+//     protected boolean adminEventsEnabled;
+//     protected Set<String> adminEnabledEventOperations = new HashSet<String>();
+//     protected boolean adminEventsDetailsEnabled;
+//     protected List<String> defaultRoles;
+//     private boolean allowUserManagedAccess;
+
+//     public Set<IdentityProviderMapperModel> getIdentityProviderMapperSet() {
+//         return identityProviderMapperSet;
+//     }
+
+//     protected List<String> defaultGroups = new LinkedList<String>();
+//     protected List<String> clientScopes = new LinkedList<>();
+//     protected List<String> defaultDefaultClientScopes = new LinkedList<>();
+//     protected List<String> optionalDefaultClientScopes = new LinkedList<>();
+//     protected boolean internationalizationEnabled;
+//     protected Set<String> supportedLocales;
+//     protected String defaultLocale;
+//     protected MultivaluedHashMap<String, IdentityProviderMapperModel> identityProviderMappers = new MultivaluedHashMap<>();
+//     protected Set<IdentityProviderMapperModel> identityProviderMapperSet;
+
+//     protected Map<String, String> attributes;
+
+//     private Map<String, Integer> userActionTokenLifespans;
+
+//     public CachedRealm(Long revision, RealmModel model) {
+//         super(revision, model.getId());
+//         name = model.getName();
+//         displayName = model.getDisplayName();
+//         displayNameHtml = model.getDisplayNameHtml();
+//         enabled = model.isEnabled();
+//         allowUserManagedAccess = model.isUserManagedAccessAllowed();
+//         sslRequired = model.getSslRequired();
+//         registrationAllowed = model.isRegistrationAllowed();
+//         registrationEmailAsUsername = model.isRegistrationEmailAsUsername();
+//         rememberMe = model.isRememberMe();
+//         verifyEmail = model.isVerifyEmail();
+//         loginWithEmailAllowed = model.isLoginWithEmailAllowed();
+//         duplicateEmailsAllowed = model.isDuplicateEmailsAllowed();
+//         resetPasswordAllowed = model.isResetPasswordAllowed();
+//         identityFederationEnabled = model.isIdentityFederationEnabled();
+//         editUsernameAllowed = model.isEditUsernameAllowed();
+//         //--- brute force settings
+//         bruteForceProtected = model.isBruteForceProtected();
+//         permanentLockout = model.isPermanentLockout();
+//         maxFailureWaitSeconds = model.getMaxFailureWaitSeconds();
+//         minimumQuickLoginWaitSeconds = model.getMinimumQuickLoginWaitSeconds();
+//         waitIncrementSeconds = model.getWaitIncrementSeconds();
+//         quickLoginCheckMilliSeconds = model.getQuickLoginCheckMilliSeconds();
+//         maxDeltaTimeSeconds = model.getMaxDeltaTimeSeconds();
+//         failureFactor = model.getFailureFactor();
+//         //--- end brute force settings
+
+//         defaultSignatureAlgorithm = model.getDefaultSignatureAlgorithm();
+//         revokeRefreshToken = model.isRevokeRefreshToken();
+//         refreshTokenMaxReuse = model.getRefreshTokenMaxReuse();
+//         ssoSessionIdleTimeout = model.getSsoSessionIdleTimeout();
+//         ssoSessionMaxLifespan = model.getSsoSessionMaxLifespan();
+//         ssoSessionIdleTimeoutRememberMe = model.getSsoSessionIdleTimeoutRememberMe();
+//         ssoSessionMaxLifespanRememberMe = model.getSsoSessionMaxLifespanRememberMe();
+//         offlineSessionIdleTimeout = model.getOfflineSessionIdleTimeout();
+//         // KEYCLOAK-7688 Offline Session Max for Offline Token
+//         offlineSessionMaxLifespanEnabled = model.isOfflineSessionMaxLifespanEnabled();
+//         offlineSessionMaxLifespan = model.getOfflineSessionMaxLifespan();
+//         accessTokenLifespan = model.getAccessTokenLifespan();
+//         accessTokenLifespanForImplicitFlow = model.getAccessTokenLifespanForImplicitFlow();
+//         accessCodeLifespan = model.getAccessCodeLifespan();
+//         accessCodeLifespanUserAction = model.getAccessCodeLifespanUserAction();
+//         accessCodeLifespanLogin = model.getAccessCodeLifespanLogin();
+//         actionTokenGeneratedByAdminLifespan = model.getActionTokenGeneratedByAdminLifespan();
+//         actionTokenGeneratedByUserLifespan = model.getActionTokenGeneratedByUserLifespan();
+//         notBefore = model.getNotBefore();
+//         passwordPolicy = model.getPasswordPolicy();
+//         otpPolicy = model.getOTPPolicy();
+
+//         loginTheme = model.getLoginTheme();
+//         accountTheme = model.getAccountTheme();
+//         adminTheme = model.getAdminTheme();
+//         emailTheme = model.getEmailTheme();
+
+//         requiredCredentials = model.getRequiredCredentials();
+//         userActionTokenLifespans = Collections.unmodifiableMap(new HashMap<>(model.getUserActionTokenLifespans()));
+
+//         this.identityProviders = new ArrayList<>();
+
+//         for (IdentityProviderModel identityProviderModel : model.getIdentityProviders()) {
+//             this.identityProviders.add(new IdentityProviderModel(identityProviderModel));
+//         }
+//         this.identityProviders = Collections.unmodifiableList(this.identityProviders);
+
+//         this.identityProviderMapperSet = model.getIdentityProviderMappers();
+//         for (IdentityProviderMapperModel mapper : identityProviderMapperSet) {
+//             identityProviderMappers.add(mapper.getIdentityProviderAlias(), mapper);
+//         }
+
+
+
+//         smtpConfig = model.getSmtpConfig();
+//         browserSecurityHeaders = model.getBrowserSecurityHeaders();
+
+//         eventsEnabled = model.isEventsEnabled();
+//         eventsExpiration = model.getEventsExpiration();
+//         eventsListeners = model.getEventsListeners();
+//         enabledEventTypes = model.getEnabledEventTypes();
+
+//         adminEventsEnabled = model.isAdminEventsEnabled();
+//         adminEventsDetailsEnabled = model.isAdminEventsDetailsEnabled();
+
+//         defaultRoles = model.getDefaultRoles();
+//         ClientModel masterAdminClient = model.getMasterAdminClient();
+//         this.masterAdminClient = (masterAdminClient != null) ? masterAdminClient.getId() : null;
+
+//         cacheClientScopes(model);
+
+//         internationalizationEnabled = model.isInternationalizationEnabled();
+//         supportedLocales = model.getSupportedLocales();
+//         defaultLocale = model.getDefaultLocale();
+//         authenticationFlowList = model.getAuthenticationFlows();
+//         for (AuthenticationFlowModel flow : authenticationFlowList) {
+//             this.authenticationFlows.put(flow.getId(), flow);
+//             authenticationExecutions.put(flow.getId(), new LinkedList<AuthenticationExecutionModel>());
+//             for (AuthenticationExecutionModel execution : model.getAuthenticationExecutions(flow.getId())) {
+//                 authenticationExecutions.add(flow.getId(), execution);
+//                 executionsById.put(execution.getId(), execution);
+//             }
+//         }
+
+//         for (AuthenticatorConfigModel authenticator : model.getAuthenticatorConfigs()) {
+//             authenticatorConfigs.put(authenticator.getId(), authenticator);
+//         }
+//         requiredActionProviderList = model.getRequiredActionProviders();
+//         for (RequiredActionProviderModel action : requiredActionProviderList) {
+//             this.requiredActionProviders.put(action.getId(), action);
+//             requiredActionProvidersByAlias.put(action.getAlias(), action);
+//         }
+
+//         for (GroupModel group : model.getDefaultGroups()) {
+//             defaultGroups.add(group.getId());
+//         }
+
+//         browserFlow = model.getBrowserFlow();
+//         registrationFlow = model.getRegistrationFlow();
+//         directGrantFlow = model.getDirectGrantFlow();
+//         resetCredentialsFlow = model.getResetCredentialsFlow();
+//         clientAuthenticationFlow = model.getClientAuthenticationFlow();
+//         dockerAuthenticationFlow = model.getDockerAuthenticationFlow();
+
+//         for (ComponentModel component : model.getComponents()) {
+//             componentsByParentAndType.add(component.getParentId() + component.getProviderType(), component);
+//         }
+//         for (ComponentModel component : model.getComponents()) {
+//             componentsByParent.add(component.getParentId(), component);
+//         }
+//         for (ComponentModel component : model.getComponents()) {
+//             components.put(component.getId(), component);
+//         }
+
+//         try {
+//             attributes = model.getAttributes();
+//         } catch (UnsupportedOperationException ex) {
+//         }
+
+//     }
+
+//     protected void cacheClientScopes(RealmModel model) {
+//         for (ClientScopeModel clientScope : model.getClientScopes()) {
+//             clientScopes.add(clientScope.getId());
+//         }
+//         for (ClientScopeModel clientScope : model.getDefaultClientScopes(true)) {
+//             defaultDefaultClientScopes.add(clientScope.getId());
+//         }
+//         for (ClientScopeModel clientScope : model.getDefaultClientScopes(false)) {
+//             optionalDefaultClientScopes.add(clientScope.getId());
+//         }
+//     }
+
+//     public String getMasterAdminClient() {
+//         return masterAdminClient;
+//     }
+
+//     public String getName() {
+//         return name;
+//     }
+
+//     public String getDisplayName() {
+//         return displayName;
+//     }
+
+//     public String getDisplayNameHtml() {
+//         return displayNameHtml;
+//     }
+
+//     public List<String> getDefaultRoles() {
+//         return defaultRoles;
+//     }
+
+//     public boolean isEnabled() {
+//         return enabled;
+//     }
+
+//     public SslRequired getSslRequired() {
+//         return sslRequired;
+//     }
+
+//     public boolean isRegistrationAllowed() {
+//         return registrationAllowed;
+//     }
+
+//     public boolean isRegistrationEmailAsUsername() {
+//         return registrationEmailAsUsername;
+//     }
+
+//     public boolean isRememberMe() {
+//         return this.rememberMe;
+//     }
+
+//     public boolean isBruteForceProtected() {
+//         return bruteForceProtected;
+//     }
+
+//     public boolean isPermanentLockout() {
+//         return permanentLockout;
+//     }
+
+//     public int getMaxFailureWaitSeconds() {
+//         return this.maxFailureWaitSeconds;
+//     }
+
+//     public int getWaitIncrementSeconds() {
+//         return this.waitIncrementSeconds;
+//     }
+
+//     public int getMinimumQuickLoginWaitSeconds() {
+//         return this.minimumQuickLoginWaitSeconds;
+//     }
+
+//     public long getQuickLoginCheckMilliSeconds() {
+//         return quickLoginCheckMilliSeconds;
+//     }
+
+//     public int getMaxDeltaTimeSeconds() {
+//         return maxDeltaTimeSeconds;
+//     }
+
+//     public int getFailureFactor() {
+//         return failureFactor;
+//     }
+
+//     public boolean isVerifyEmail() {
+//         return verifyEmail;
+//     }
     
-    public boolean isLoginWithEmailAllowed() {
-        return loginWithEmailAllowed;
-    }
+//     public boolean isLoginWithEmailAllowed() {
+//         return loginWithEmailAllowed;
+//     }
     
-    public boolean isDuplicateEmailsAllowed() {
-        return duplicateEmailsAllowed;
-    }
-
-    public boolean isResetPasswordAllowed() {
-        return resetPasswordAllowed;
-    }
-
-    public boolean isEditUsernameAllowed() {
-        return editUsernameAllowed;
-    }
-
-    public String getDefaultSignatureAlgorithm() {
-        return defaultSignatureAlgorithm;
-    }
-
-    public boolean isRevokeRefreshToken() {
-        return revokeRefreshToken;
-    }
-
-    public int getRefreshTokenMaxReuse() {
-        return refreshTokenMaxReuse;
-    }
-
-    public int getSsoSessionIdleTimeout() {
-        return ssoSessionIdleTimeout;
-    }
-
-    public int getSsoSessionMaxLifespan() {
-        return ssoSessionMaxLifespan;
-    }
-
-    public int getSsoSessionIdleTimeoutRememberMe() {
-        return ssoSessionIdleTimeoutRememberMe;
-    }
-
-    public int getSsoSessionMaxLifespanRememberMe() {
-        return ssoSessionMaxLifespanRememberMe;
-    }
-
-    public int getOfflineSessionIdleTimeout() {
-        return offlineSessionIdleTimeout;
-    }
-
-    // KEYCLOAK-7688 Offline Session Max for Offline Token
-    public boolean isOfflineSessionMaxLifespanEnabled() {
-        return offlineSessionMaxLifespanEnabled;
-    }
-
-    public int getOfflineSessionMaxLifespan() {
-        return offlineSessionMaxLifespan;
-    }
-
-    public int getAccessTokenLifespan() {
-        return accessTokenLifespan;
-    }
-
-    public int getAccessTokenLifespanForImplicitFlow() {
-        return accessTokenLifespanForImplicitFlow;
-    }
-
-    public int getAccessCodeLifespan() {
-        return accessCodeLifespan;
-    }
-
-    public int getAccessCodeLifespanUserAction() {
-        return accessCodeLifespanUserAction;
-    }
-
-    public Map<String, Integer> getUserActionTokenLifespans() {
-        return userActionTokenLifespans;
-    }
-
-    public int getAccessCodeLifespanLogin() {
-        return accessCodeLifespanLogin;
-    }
-
-    public int getActionTokenGeneratedByAdminLifespan() {
-        return actionTokenGeneratedByAdminLifespan;
-    }
-
-    public int getActionTokenGeneratedByUserLifespan() {
-        return actionTokenGeneratedByUserLifespan;
-    }
-
-    /**
-     * This method is supposed to return user lifespan based on the action token ID
-     * provided. If nothing is provided, it will return the default lifespan.
-     * @param actionTokenId
-     * @return lifespan
-     */
-    public int getActionTokenGeneratedByUserLifespan(String actionTokenId) {
-        if (actionTokenId == null || this.userActionTokenLifespans.get(actionTokenId) == null)
-            return getActionTokenGeneratedByUserLifespan();
-        return this.userActionTokenLifespans.get(actionTokenId);
-    }
-
-    public List<RequiredCredentialModel> getRequiredCredentials() {
-        return requiredCredentials;
-    }
-
-    public PasswordPolicy getPasswordPolicy() {
-        return passwordPolicy;
-    }
-
-    public boolean isIdentityFederationEnabled() {
-        return identityFederationEnabled;
-    }
-
-    public Map<String, String> getSmtpConfig() {
-        return smtpConfig;
-    }
-
-    public Map<String, String> getBrowserSecurityHeaders() {
-        return browserSecurityHeaders;
-    }
-
-    public String getLoginTheme() {
-        return loginTheme;
-    }
-
-    public String getAccountTheme() {
-        return accountTheme;
-    }
-
-    public String getAdminTheme() {
-        return this.adminTheme;
-    }
-
-    public String getEmailTheme() {
-        return emailTheme;
-    }
-
-    public int getNotBefore() {
-        return notBefore;
-    }
-
-    public boolean isEventsEnabled() {
-        return eventsEnabled;
-    }
-
-    public long getEventsExpiration() {
-        return eventsExpiration;
-    }
-
-    public Set<String> getEventsListeners() {
-        return eventsListeners;
-    }
-
-    public Set<String> getEnabledEventTypes() {
-        return enabledEventTypes;
-    }
-
-    public boolean isAdminEventsEnabled() {
-        return adminEventsEnabled;
-    }
-
-    public Set<String> getAdminEnabledEventOperations() {
-        return adminEnabledEventOperations;
-    }
-
-    public boolean isAdminEventsDetailsEnabled() {
-        return adminEventsDetailsEnabled;
-    }
-
-    public List<IdentityProviderModel> getIdentityProviders() {
-        return identityProviders;
-    }
-
-    public boolean isInternationalizationEnabled() {
-        return internationalizationEnabled;
-    }
-
-    public Set<String> getSupportedLocales() {
-        return supportedLocales;
-    }
-
-    public String getDefaultLocale() {
-        return defaultLocale;
-    }
-
-    public MultivaluedHashMap<String, IdentityProviderMapperModel> getIdentityProviderMappers() {
-        return identityProviderMappers;
-    }
-
-    public Map<String, AuthenticationFlowModel> getAuthenticationFlows() {
-        return authenticationFlows;
-    }
-
-    public Map<String, AuthenticatorConfigModel> getAuthenticatorConfigs() {
-        return authenticatorConfigs;
-    }
-
-    public MultivaluedHashMap<String, AuthenticationExecutionModel> getAuthenticationExecutions() {
-        return authenticationExecutions;
-    }
+//     public boolean isDuplicateEmailsAllowed() {
+//         return duplicateEmailsAllowed;
+//     }
+
+//     public boolean isResetPasswordAllowed() {
+//         return resetPasswordAllowed;
+//     }
+
+//     public boolean isEditUsernameAllowed() {
+//         return editUsernameAllowed;
+//     }
+
+//     public String getDefaultSignatureAlgorithm() {
+//         return defaultSignatureAlgorithm;
+//     }
+
+//     public boolean isRevokeRefreshToken() {
+//         return revokeRefreshToken;
+//     }
+
+//     public int getRefreshTokenMaxReuse() {
+//         return refreshTokenMaxReuse;
+//     }
+
+//     public int getSsoSessionIdleTimeout() {
+//         return ssoSessionIdleTimeout;
+//     }
+
+//     public int getSsoSessionMaxLifespan() {
+//         return ssoSessionMaxLifespan;
+//     }
+
+//     public int getSsoSessionIdleTimeoutRememberMe() {
+//         return ssoSessionIdleTimeoutRememberMe;
+//     }
+
+//     public int getSsoSessionMaxLifespanRememberMe() {
+//         return ssoSessionMaxLifespanRememberMe;
+//     }
+
+//     public int getOfflineSessionIdleTimeout() {
+//         return offlineSessionIdleTimeout;
+//     }
+
+//     // KEYCLOAK-7688 Offline Session Max for Offline Token
+//     public boolean isOfflineSessionMaxLifespanEnabled() {
+//         return offlineSessionMaxLifespanEnabled;
+//     }
+
+//     public int getOfflineSessionMaxLifespan() {
+//         return offlineSessionMaxLifespan;
+//     }
+
+//     public int getAccessTokenLifespan() {
+//         return accessTokenLifespan;
+//     }
+
+//     public int getAccessTokenLifespanForImplicitFlow() {
+//         return accessTokenLifespanForImplicitFlow;
+//     }
+
+//     public int getAccessCodeLifespan() {
+//         return accessCodeLifespan;
+//     }
+
+//     public int getAccessCodeLifespanUserAction() {
+//         return accessCodeLifespanUserAction;
+//     }
+
+//     public Map<String, Integer> getUserActionTokenLifespans() {
+//         return userActionTokenLifespans;
+//     }
+
+//     public int getAccessCodeLifespanLogin() {
+//         return accessCodeLifespanLogin;
+//     }
+
+//     public int getActionTokenGeneratedByAdminLifespan() {
+//         return actionTokenGeneratedByAdminLifespan;
+//     }
+
+//     public int getActionTokenGeneratedByUserLifespan() {
+//         return actionTokenGeneratedByUserLifespan;
+//     }
+
+//     /**
+//      * This method is supposed to return user lifespan based on the action token ID
+//      * provided. If nothing is provided, it will return the default lifespan.
+//      * @param actionTokenId
+//      * @return lifespan
+//      */
+//     public int getActionTokenGeneratedByUserLifespan(String actionTokenId) {
+//         if (actionTokenId == null || this.userActionTokenLifespans.get(actionTokenId) == null)
+//             return getActionTokenGeneratedByUserLifespan();
+//         return this.userActionTokenLifespans.get(actionTokenId);
+//     }
+
+//     public List<RequiredCredentialModel> getRequiredCredentials() {
+//         return requiredCredentials;
+//     }
+
+//     public PasswordPolicy getPasswordPolicy() {
+//         return passwordPolicy;
+//     }
+
+//     public boolean isIdentityFederationEnabled() {
+//         return identityFederationEnabled;
+//     }
+
+//     public Map<String, String> getSmtpConfig() {
+//         return smtpConfig;
+//     }
+
+//     public Map<String, String> getBrowserSecurityHeaders() {
+//         return browserSecurityHeaders;
+//     }
+
+//     public String getLoginTheme() {
+//         return loginTheme;
+//     }
+
+//     public String getAccountTheme() {
+//         return accountTheme;
+//     }
+
+//     public String getAdminTheme() {
+//         return this.adminTheme;
+//     }
+
+//     public String getEmailTheme() {
+//         return emailTheme;
+//     }
+
+//     public int getNotBefore() {
+//         return notBefore;
+//     }
+
+//     public boolean isEventsEnabled() {
+//         return eventsEnabled;
+//     }
+
+//     public long getEventsExpiration() {
+//         return eventsExpiration;
+//     }
+
+//     public Set<String> getEventsListeners() {
+//         return eventsListeners;
+//     }
+
+//     public Set<String> getEnabledEventTypes() {
+//         return enabledEventTypes;
+//     }
+
+//     public boolean isAdminEventsEnabled() {
+//         return adminEventsEnabled;
+//     }
+
+//     public Set<String> getAdminEnabledEventOperations() {
+//         return adminEnabledEventOperations;
+//     }
+
+//     public boolean isAdminEventsDetailsEnabled() {
+//         return adminEventsDetailsEnabled;
+//     }
+
+//     public List<IdentityProviderModel> getIdentityProviders() {
+//         return identityProviders;
+//     }
+
+//     public boolean isInternationalizationEnabled() {
+//         return internationalizationEnabled;
+//     }
+
+//     public Set<String> getSupportedLocales() {
+//         return supportedLocales;
+//     }
+
+//     public String getDefaultLocale() {
+//         return defaultLocale;
+//     }
+
+//     public MultivaluedHashMap<String, IdentityProviderMapperModel> getIdentityProviderMappers() {
+//         return identityProviderMappers;
+//     }
+
+//     public Map<String, AuthenticationFlowModel> getAuthenticationFlows() {
+//         return authenticationFlows;
+//     }
+
+//     public Map<String, AuthenticatorConfigModel> getAuthenticatorConfigs() {
+//         return authenticatorConfigs;
+//     }
+
+//     public MultivaluedHashMap<String, AuthenticationExecutionModel> getAuthenticationExecutions() {
+//         return authenticationExecutions;
+//     }
 
-    public Map<String, AuthenticationExecutionModel> getExecutionsById() {
-        return executionsById;
-    }
-
-    public Map<String, RequiredActionProviderModel> getRequiredActionProviders() {
-        return requiredActionProviders;
-    }
-
-    public Map<String, RequiredActionProviderModel> getRequiredActionProvidersByAlias() {
-        return requiredActionProvidersByAlias;
-    }
-
-    public OTPPolicy getOtpPolicy() {
-        return otpPolicy;
-    }
-
-    public AuthenticationFlowModel getBrowserFlow() {
-        return browserFlow;
-    }
-
-    public AuthenticationFlowModel getRegistrationFlow() {
-        return registrationFlow;
-    }
-
-    public AuthenticationFlowModel getDirectGrantFlow() {
-        return directGrantFlow;
-    }
-
-    public AuthenticationFlowModel getResetCredentialsFlow() {
-        return resetCredentialsFlow;
-    }
-
-    public AuthenticationFlowModel getClientAuthenticationFlow() {
-        return clientAuthenticationFlow;
-    }
-
-    public AuthenticationFlowModel getDockerAuthenticationFlow() {
-        return dockerAuthenticationFlow;
-    }
-
-    public List<String> getDefaultGroups() {
-        return defaultGroups;
-    }
-
-    public List<String> getClientScopes() {
-        return clientScopes;
-    }
-
-    public List<String> getDefaultDefaultClientScopes() {
-        return defaultDefaultClientScopes;
-    }
-
-    public List<String> getOptionalDefaultClientScopes() {
-        return optionalDefaultClientScopes;
-    }
-
-    public List<AuthenticationFlowModel> getAuthenticationFlowList() {
-        return authenticationFlowList;
-    }
-
-    public List<RequiredActionProviderModel> getRequiredActionProviderList() {
-        return requiredActionProviderList;
-    }
-
-    public MultivaluedHashMap<String, ComponentModel> getComponentsByParent() {
-        return componentsByParent;
-    }
-
-    public MultivaluedHashMap<String, ComponentModel> getComponentsByParentAndType() {
-        return componentsByParentAndType;
-    }
-
-    public Map<String, ComponentModel> getComponents() {
-        return components;
-    }
-
-    public String getAttribute(String name) {
-        return attributes != null ? attributes.get(name) : null;
-    }
-
-    public Integer getAttribute(String name, Integer defaultValue) {
-        String v = getAttribute(name);
-        return v != null ? Integer.parseInt(v) : defaultValue;
-    }
-
-    public Long getAttribute(String name, Long defaultValue) {
-        String v = getAttribute(name);
-        return v != null ? Long.parseLong(v) : defaultValue;
-    }
-
-    public Boolean getAttribute(String name, Boolean defaultValue) {
-        String v = getAttribute(name);
-        return v != null ? Boolean.parseBoolean(v) : defaultValue;
-    }
-
-    public Map<String, String> getAttributes() {
-        return attributes;
-    }
-
-    public boolean isAllowUserManagedAccess() {
-        return allowUserManagedAccess;
-    }
-}
+//     public Map<String, AuthenticationExecutionModel> getExecutionsById() {
+//         return executionsById;
+//     }
+
+//     public Map<String, RequiredActionProviderModel> getRequiredActionProviders() {
+//         return requiredActionProviders;
+//     }
+
+//     public Map<String, RequiredActionProviderModel> getRequiredActionProvidersByAlias() {
+//         return requiredActionProvidersByAlias;
+//     }
+
+//     public OTPPolicy getOtpPolicy() {
+//         return otpPolicy;
+//     }
+
+//     public AuthenticationFlowModel getBrowserFlow() {
+//         return browserFlow;
+//     }
+
+//     public AuthenticationFlowModel getRegistrationFlow() {
+//         return registrationFlow;
+//     }
+
+//     public AuthenticationFlowModel getDirectGrantFlow() {
+//         return directGrantFlow;
+//     }
+
+//     public AuthenticationFlowModel getResetCredentialsFlow() {
+//         return resetCredentialsFlow;
+//     }
+
+//     public AuthenticationFlowModel getClientAuthenticationFlow() {
+//         return clientAuthenticationFlow;
+//     }
+
+//     public AuthenticationFlowModel getDockerAuthenticationFlow() {
+//         return dockerAuthenticationFlow;
+//     }
+
+//     public List<String> getDefaultGroups() {
+//         return defaultGroups;
+//     }
+
+//     public List<String> getClientScopes() {
+//         return clientScopes;
+//     }
+
+//     public List<String> getDefaultDefaultClientScopes() {
+//         return defaultDefaultClientScopes;
+//     }
+
+//     public List<String> getOptionalDefaultClientScopes() {
+//         return optionalDefaultClientScopes;
+//     }
+
+//     public List<AuthenticationFlowModel> getAuthenticationFlowList() {
+//         return authenticationFlowList;
+//     }
+
+//     public List<RequiredActionProviderModel> getRequiredActionProviderList() {
+//         return requiredActionProviderList;
+//     }
+
+//     public MultivaluedHashMap<String, ComponentModel> getComponentsByParent() {
+//         return componentsByParent;
+//     }
+
+//     public MultivaluedHashMap<String, ComponentModel> getComponentsByParentAndType() {
+//         return componentsByParentAndType;
+//     }
+
+//     public Map<String, ComponentModel> getComponents() {
+//         return components;
+//     }
+
+//     public String getAttribute(String name) {
+//         return attributes != null ? attributes.get(name) : null;
+//     }
+
+//     public Integer getAttribute(String name, Integer defaultValue) {
+//         String v = getAttribute(name);
+//         return v != null ? Integer.parseInt(v) : defaultValue;
+//     }
+
+//     public Long getAttribute(String name, Long defaultValue) {
+//         String v = getAttribute(name);
+//         return v != null ? Long.parseLong(v) : defaultValue;
+//     }
+
+//     public Boolean getAttribute(String name, Boolean defaultValue) {
+//         String v = getAttribute(name);
+//         return v != null ? Boolean.parseBoolean(v) : defaultValue;
+//     }
+
+//     public Map<String, String> getAttributes() {
+//         return attributes;
+//     }
+
+//     public boolean isAllowUserManagedAccess() {
+//         return allowUserManagedAccess;
+//     }
+// }

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealmRole.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealmRole.java
index ac36e11..02edf93 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealmRole.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealmRole.java
@@ -15,21 +15,21 @@
  * limitations under the License.
  */
 
-package org.keycloak.models.cache.infinispan.entities;
+// package org.keycloak.models.cache.infinispan.entities;
 
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.RoleModel;
+// import org.keycloak.models.RealmModel;
+// import org.keycloak.models.RoleModel;
 
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class CachedRealmRole extends CachedRole {
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class CachedRealmRole extends CachedRole {
 
 
-    public CachedRealmRole(Long revision, RoleModel model, RealmModel realm) {
-        super(revision, model, realm);
+//     public CachedRealmRole(Long revision, RoleModel model, RealmModel realm) {
+//         super(revision, model, realm);
 
-    }
+//     }
 
-}
+// }

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRole.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRole.java
index 47bfa72..6ec3fec 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRole.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRole.java
@@ -15,66 +15,66 @@
  * limitations under the License.
  */
 
-package org.keycloak.models.cache.infinispan.entities;
+// package org.keycloak.models.cache.infinispan.entities;
 
-import org.keycloak.common.util.MultivaluedHashMap;
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.RoleModel;
-import org.keycloak.models.cache.infinispan.DefaultLazyLoader;
-import org.keycloak.models.cache.infinispan.LazyLoader;
+// import org.keycloak.common.util.MultivaluedHashMap;
+// import org.keycloak.models.RealmModel;
+// import org.keycloak.models.RoleModel;
+// import org.keycloak.models.cache.infinispan.DefaultLazyLoader;
+// import org.keycloak.models.cache.infinispan.LazyLoader;
 
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Supplier;
+// import java.util.HashSet;
+// import java.util.Set;
+// import java.util.function.Supplier;
 
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class CachedRole extends AbstractRevisioned implements InRealm {
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class CachedRole extends AbstractRevisioned implements InRealm {
 
-    final protected String name;
-    final protected String realm;
-    final protected String description;
-    final protected boolean composite;
-    final protected Set<String> composites = new HashSet<String>();
-    private final LazyLoader<RoleModel, MultivaluedHashMap<String, String>> attributes;
+//     final protected String name;
+//     final protected String realm;
+//     final protected String description;
+//     final protected boolean composite;
+//     final protected Set<String> composites = new HashSet<String>();
+//     private final LazyLoader<RoleModel, MultivaluedHashMap<String, String>> attributes;
 
-    public CachedRole(Long revision, RoleModel model, RealmModel realm) {
-        super(revision, model.getId());
-        composite = model.isComposite();
-        description = model.getDescription();
-        name = model.getName();
-        this.realm = realm.getId();
-        if (composite) {
-            for (RoleModel child : model.getComposites()) {
-                composites.add(child.getId());
-            }
-        }
-        attributes = new DefaultLazyLoader<>(roleModel -> new MultivaluedHashMap<>(roleModel.getAttributes()), MultivaluedHashMap::new);
-    }
+//     public CachedRole(Long revision, RoleModel model, RealmModel realm) {
+//         super(revision, model.getId());
+//         composite = model.isComposite();
+//         description = model.getDescription();
+//         name = model.getName();
+//         this.realm = realm.getId();
+//         if (composite) {
+//             for (RoleModel child : model.getComposites()) {
+//                 composites.add(child.getId());
+//             }
+//         }
+//         attributes = new DefaultLazyLoader<>(roleModel -> new MultivaluedHashMap<>(roleModel.getAttributes()), MultivaluedHashMap::new);
+//     }
 
-    public String getName() {
-        return name;
-    }
+//     public String getName() {
+//         return name;
+//     }
 
-    public String getRealm() {
-        return realm;
-    }
+//     public String getRealm() {
+//         return realm;
+//     }
 
-    public String getDescription() {
-        return description;
-    }
+//     public String getDescription() {
+//         return description;
+//     }
 
-    public boolean isComposite() {
-        return composite;
-    }
+//     public boolean isComposite() {
+//         return composite;
+//     }
 
-    public Set<String> getComposites() {
-        return composites;
-    }
+//     public Set<String> getComposites() {
+//         return composites;
+//     }
 
-    public MultivaluedHashMap<String, String> getAttributes(Supplier<RoleModel> roleModel) {
-        return attributes.get(roleModel);
-    }
-}
+//     public MultivaluedHashMap<String, String> getAttributes(Supplier<RoleModel> roleModel) {
+//         return attributes.get(roleModel);
+//     }
+// }

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUser.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUser.java
index 22aa8a4..8d1e179 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUser.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUser.java
@@ -15,120 +15,120 @@
  * limitations under the License.
  */
 
-package org.keycloak.models.cache.infinispan.entities;
-
-import org.keycloak.common.util.MultivaluedHashMap;
-import org.keycloak.models.GroupModel;
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.RoleModel;
-import org.keycloak.models.UserModel;
-import org.keycloak.models.cache.infinispan.DefaultLazyLoader;
-import org.keycloak.models.cache.infinispan.LazyLoader;
-
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class CachedUser extends AbstractExtendableRevisioned implements InRealm  {
-
-    private final String realm;
-    private final String username;
-    private final Long createdTimestamp;
-    private final String firstName;
-    private final String lastName;
-    private final String email;
-    private final boolean emailVerified;
-    private final boolean enabled;
-    private final String federationLink;
-    private final String serviceAccountClientLink;
-    private final int notBefore;
-    private final LazyLoader<UserModel, Set<String>> requiredActions;
-    private final LazyLoader<UserModel, MultivaluedHashMap<String, String>> attributes;
-    private final LazyLoader<UserModel, Set<String>> roleMappings;
-    private final LazyLoader<UserModel, Set<String>> groups;
-
-    public CachedUser(Long revision, RealmModel realm, UserModel user, int notBefore) {
-        super(revision, user.getId());
-        this.realm = realm.getId();
-        this.username = user.getUsername();
-        this.createdTimestamp = user.getCreatedTimestamp();
-        this.firstName = user.getFirstName();
-        this.lastName = user.getLastName();
-        this.email = user.getEmail();
-        this.emailVerified = user.isEmailVerified();
-        this.enabled = user.isEnabled();
-        this.federationLink = user.getFederationLink();
-        this.serviceAccountClientLink = user.getServiceAccountClientLink();
-        this.notBefore = notBefore;
-        this.requiredActions = new DefaultLazyLoader<>(UserModel::getRequiredActions, Collections::emptySet);
-        this.attributes = new DefaultLazyLoader<>(userModel -> new MultivaluedHashMap<>(userModel.getAttributes()), MultivaluedHashMap::new);
-        this.roleMappings = new DefaultLazyLoader<>(userModel -> userModel.getRoleMappings().stream().map(RoleModel::getId).collect(Collectors.toSet()), Collections::emptySet);
-        this.groups = new DefaultLazyLoader<>(userModel -> userModel.getGroups().stream().map(GroupModel::getId).collect(Collectors.toCollection(LinkedHashSet::new)), LinkedHashSet::new);
-    }
-
-    public String getRealm() {
-        return realm;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public Long getCreatedTimestamp() {
-        return createdTimestamp;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public boolean isEmailVerified() {
-        return emailVerified;
-    }
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public MultivaluedHashMap<String, String> getAttributes(Supplier<UserModel> userModel) {
-        return attributes.get(userModel);
-    }
-
-    public Set<String> getRequiredActions(Supplier<UserModel> userModel) {
-        return this.requiredActions.get(userModel);
-    }
-
-    public Set<String> getRoleMappings(Supplier<UserModel> userModel) {
-        return roleMappings.get(userModel);
-    }
-
-    public String getFederationLink() {
-        return federationLink;
-    }
-
-    public String getServiceAccountClientLink() {
-        return serviceAccountClientLink;
-    }
-
-    public Set<String> getGroups(Supplier<UserModel> userModel) {
-        return groups.get(userModel);
-    }
-
-    public int getNotBefore() {
-        return notBefore;
-    }
-}
+// package org.keycloak.models.cache.infinispan.entities;
+
+// import org.keycloak.common.util.MultivaluedHashMap;
+// import org.keycloak.models.GroupModel;
+// import org.keycloak.models.RealmModel;
+// import org.keycloak.models.RoleModel;
+// import org.keycloak.models.UserModel;
+// import org.keycloak.models.cache.infinispan.DefaultLazyLoader;
+// import org.keycloak.models.cache.infinispan.LazyLoader;
+
+// import java.util.Collections;
+// import java.util.LinkedHashSet;
+// import java.util.Set;
+// import java.util.function.Supplier;
+// import java.util.stream.Collectors;
+
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class CachedUser extends AbstractExtendableRevisioned implements InRealm  {
+
+//     private final String realm;
+//     private final String username;
+//     private final Long createdTimestamp;
+//     private final String firstName;
+//     private final String lastName;
+//     private final String email;
+//     private final boolean emailVerified;
+//     private final boolean enabled;
+//     private final String federationLink;
+//     private final String serviceAccountClientLink;
+//     private final int notBefore;
+//     private final LazyLoader<UserModel, Set<String>> requiredActions;
+//     private final LazyLoader<UserModel, MultivaluedHashMap<String, String>> attributes;
+//     private final LazyLoader<UserModel, Set<String>> roleMappings;
+//     private final LazyLoader<UserModel, Set<String>> groups;
+
+//     public CachedUser(Long revision, RealmModel realm, UserModel user, int notBefore) {
+//         super(revision, user.getId());
+//         this.realm = realm.getId();
+//         this.username = user.getUsername();
+//         this.createdTimestamp = user.getCreatedTimestamp();
+//         this.firstName = user.getFirstName();
+//         this.lastName = user.getLastName();
+//         this.email = user.getEmail();
+//         this.emailVerified = user.isEmailVerified();
+//         this.enabled = user.isEnabled();
+//         this.federationLink = user.getFederationLink();
+//         this.serviceAccountClientLink = user.getServiceAccountClientLink();
+//         this.notBefore = notBefore;
+//         this.requiredActions = new DefaultLazyLoader<>(UserModel::getRequiredActions, Collections::emptySet);
+//         this.attributes = new DefaultLazyLoader<>(userModel -> new MultivaluedHashMap<>(userModel.getAttributes()), MultivaluedHashMap::new);
+//         this.roleMappings = new DefaultLazyLoader<>(userModel -> userModel.getRoleMappings().stream().map(RoleModel::getId).collect(Collectors.toSet()), Collections::emptySet);
+//         this.groups = new DefaultLazyLoader<>(userModel -> userModel.getGroups().stream().map(GroupModel::getId).collect(Collectors.toCollection(LinkedHashSet::new)), LinkedHashSet::new);
+//     }
+
+//     public String getRealm() {
+//         return realm;
+//     }
+
+//     public String getUsername() {
+//         return username;
+//     }
+
+//     public Long getCreatedTimestamp() {
+//         return createdTimestamp;
+//     }
+
+//     public String getFirstName() {
+//         return firstName;
+//     }
+
+//     public String getLastName() {
+//         return lastName;
+//     }
+
+//     public String getEmail() {
+//         return email;
+//     }
+
+//     public boolean isEmailVerified() {
+//         return emailVerified;
+//     }
+
+//     public boolean isEnabled() {
+//         return enabled;
+//     }
+
+//     public MultivaluedHashMap<String, String> getAttributes(Supplier<UserModel> userModel) {
+//         return attributes.get(userModel);
+//     }
+
+//     public Set<String> getRequiredActions(Supplier<UserModel> userModel) {
+//         return this.requiredActions.get(userModel);
+//     }
+
+//     public Set<String> getRoleMappings(Supplier<UserModel> userModel) {
+//         return roleMappings.get(userModel);
+//     }
+
+//     public String getFederationLink() {
+//         return federationLink;
+//     }
+
+//     public String getServiceAccountClientLink() {
+//         return serviceAccountClientLink;
+//     }
+
+//     public Set<String> getGroups(Supplier<UserModel> userModel) {
+//         return groups.get(userModel);
+//     }
+
+//     public int getNotBefore() {
+//         return notBefore;
+//     }
+// }

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsent.java
index 7be27e7..5fa9de2 100644
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsent.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsent.java
@@ -15,48 +15,48 @@
  * limitations under the License.
  */
 
-package org.keycloak.models.cache.infinispan.entities;
-
-import org.keycloak.models.ClientScopeModel;
-import org.keycloak.models.ProtocolMapperModel;
-import org.keycloak.models.RoleModel;
-import org.keycloak.models.UserConsentModel;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
- */
-public class CachedUserConsent {
-
-    private final String clientDbId;
-    private final Set<String> clientScopeIds = new HashSet<>();
-    private final Long createdDate;
-    private final Long lastUpdatedDate;
-
-    public CachedUserConsent(UserConsentModel consentModel) {
-        this.clientDbId = consentModel.getClient().getId();
-        for (ClientScopeModel clientScope : consentModel.getGrantedClientScopes()) {
-            this.clientScopeIds.add(clientScope.getId());
-        }
-        this.createdDate = consentModel.getCreatedDate();
-        this.lastUpdatedDate = consentModel.getLastUpdatedDate();
-    }
-
-    public String getClientDbId() {
-        return clientDbId;
-    }
-
-    public Set<String> getClientScopeIds() {
-        return clientScopeIds;
-    }
-
-    public Long getCreatedDate() {
-        return createdDate;
-    }
-
-    public Long getLastUpdatedDate() {
-        return lastUpdatedDate;
-    }
-}
+// package org.keycloak.models.cache.infinispan.entities;
+
+// import org.keycloak.models.ClientScopeModel;
+// import org.keycloak.models.ProtocolMapperModel;
+// import org.keycloak.models.RoleModel;
+// import org.keycloak.models.UserConsentModel;
+
+// import java.util.HashSet;
+// import java.util.Set;
+
+// /**
+//  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+//  */
+// public class CachedUserConsent {
+
+//     private final String clientDbId;
+//     private final Set<String> clientScopeIds = new HashSet<>();
+//     private final Long createdDate;
+//     private final Long lastUpdatedDate;
+
+//     public CachedUserConsent(UserConsentModel consentModel) {
+//         this.clientDbId = consentModel.getClient().getId();
+//         for (ClientScopeModel clientScope : consentModel.getGrantedClientScopes()) {
+//             this.clientScopeIds.add(clientScope.getId());
+//         }
+//         this.createdDate = consentModel.getCreatedDate();
+//         this.lastUpdatedDate = consentModel.getLastUpdatedDate();
+//     }
+
+//     public String getClientDbId() {
+//         return clientDbId;
+//     }
+
+//     public Set<String> getClientScopeIds() {
+//         return clientScopeIds;
+//     }
+
+//     public Long getCreatedDate() {
+//         return createdDate;
+//     }
+
+//     public Long getLastUpdatedDate() {
+//         return lastUpdatedDate;
+//     }
+// }

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsents.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsents.java
index eaca957..9a21192 100644
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsents.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsents.java
@@ -14,40 +14,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.keycloak.models.cache.infinispan.entities;
+// package org.keycloak.models.cache.infinispan.entities;
 
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.UserConsentModel;
+// import org.keycloak.models.RealmModel;
+// import org.keycloak.models.UserConsentModel;
 
-import java.util.HashMap;
-import java.util.List;
+// import java.util.HashMap;
+// import java.util.List;
 
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class CachedUserConsents extends AbstractRevisioned implements InRealm {
-    private HashMap<String, CachedUserConsent> consents = new HashMap<>();
-    private final String realmId;
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class CachedUserConsents extends AbstractRevisioned implements InRealm {
+//     private HashMap<String, CachedUserConsent> consents = new HashMap<>();
+//     private final String realmId;
 
-    public CachedUserConsents(Long revision, String id, RealmModel realm,
-                              List<UserConsentModel> consents) {
-        super(revision, id);
-        this.realmId = realm.getId();
-        if (consents != null) {
-            for (UserConsentModel consent : consents) {
-                this.consents.put(consent.getClient().getId(), new CachedUserConsent(consent));
-            }
-        }
-    }
+//     public CachedUserConsents(Long revision, String id, RealmModel realm,
+//                               List<UserConsentModel> consents) {
+//         super(revision, id);
+//         this.realmId = realm.getId();
+//         if (consents != null) {
+//             for (UserConsentModel consent : consents) {
+//                 this.consents.put(consent.getClient().getId(), new CachedUserConsent(consent));
+//             }
+//         }
+//     }
 
-    @Override
-    public String getRealm() {
-        return realmId;
-    }
+//     @Override
+//     public String getRealm() {
+//         return realmId;
+//     }
 
 
-    public HashMap<String, CachedUserConsent> getConsents() {
-        return consents;
-    }
-}
+//     public HashMap<String, CachedUserConsent> getConsents() {
+//         return consents;
+//     }
+// }

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientListQuery.java
index 4fc650d..062977c 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientListQuery.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientListQuery.java
@@ -1,49 +1,49 @@
-package org.keycloak.models.cache.infinispan.entities;
-
-import org.keycloak.models.RealmModel;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class ClientListQuery extends AbstractRevisioned implements ClientQuery {
-    private final Set<String> clients;
-    private final String realm;
-    private final String realmName;
-
-    public ClientListQuery(Long revisioned, String id, RealmModel realm, Set<String> clients) {
-        super(revisioned, id);
-        this.realm = realm.getId();
-        this.realmName = realm.getName();
-        this.clients = clients;
-    }
-
-    public ClientListQuery(Long revisioned, String id, RealmModel realm, String client) {
-        super(revisioned, id);
-        this.realm = realm.getId();
-        this.realmName = realm.getName();
-        this.clients = new HashSet<>();
-        this.clients.add(client);
-    }
-
-    @Override
-    public Set<String> getClients() {
-        return clients;
-    }
-
-    @Override
-    public String getRealm() {
-        return realm;
-    }
-
-    @Override
-    public String toString() {
-        return "ClientListQuery{" +
-                "id='" + getId() + "'" +
-                "realmName='" + realmName + '\'' +
-                '}';
-    }
-}
+// package org.keycloak.models.cache.infinispan.entities;
+
+// import org.keycloak.models.RealmModel;
+
+// import java.util.HashSet;
+// import java.util.Set;
+
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class ClientListQuery extends AbstractRevisioned implements ClientQuery {
+//     private final Set<String> clients;
+//     private final String realm;
+//     private final String realmName;
+
+//     public ClientListQuery(Long revisioned, String id, RealmModel realm, Set<String> clients) {
+//         super(revisioned, id);
+//         this.realm = realm.getId();
+//         this.realmName = realm.getName();
+//         this.clients = clients;
+//     }
+
+//     public ClientListQuery(Long revisioned, String id, RealmModel realm, String client) {
+//         super(revisioned, id);
+//         this.realm = realm.getId();
+//         this.realmName = realm.getName();
+//         this.clients = new HashSet<>();
+//         this.clients.add(client);
+//     }
+
+//     @Override
+//     public Set<String> getClients() {
+//         return clients;
+//     }
+
+//     @Override
+//     public String getRealm() {
+//         return realm;
+//     }
+
+//     @Override
+//     public String toString() {
+//         return "ClientListQuery{" +
+//                 "id='" + getId() + "'" +
+//                 "realmName='" + realmName + '\'' +
+//                 '}';
+//     }
+// }

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientQuery.java
index ce1ab51..08dc40a 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientQuery.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientQuery.java
@@ -1,11 +1,11 @@
-package org.keycloak.models.cache.infinispan.entities;
+// package org.keycloak.models.cache.infinispan.entities;
 
-import java.util.Set;
+// import java.util.Set;
 
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public interface ClientQuery extends InRealm {
-    Set<String> getClients();
-}
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public interface ClientQuery extends InRealm {
+//     Set<String> getClients();
+// }

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/GroupListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/GroupListQuery.java
index 1e0c664..d190c30 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/GroupListQuery.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/GroupListQuery.java
@@ -1,40 +1,40 @@
-package org.keycloak.models.cache.infinispan.entities;
+// package org.keycloak.models.cache.infinispan.entities;
 
-import org.keycloak.models.RealmModel;
+// import org.keycloak.models.RealmModel;
 
-import java.util.Set;
+// import java.util.Set;
 
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class GroupListQuery extends AbstractRevisioned implements GroupQuery {
-    private final Set<String> groups;
-    private final String realm;
-    private final String realmName;
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class GroupListQuery extends AbstractRevisioned implements GroupQuery {
+//     private final Set<String> groups;
+//     private final String realm;
+//     private final String realmName;
 
-    public GroupListQuery(Long revisioned, String id, RealmModel realm, Set<String> groups) {
-        super(revisioned, id);
-        this.realm = realm.getId();
-        this.realmName = realm.getName();
-        this.groups = groups;
-    }
+//     public GroupListQuery(Long revisioned, String id, RealmModel realm, Set<String> groups) {
+//         super(revisioned, id);
+//         this.realm = realm.getId();
+//         this.realmName = realm.getName();
+//         this.groups = groups;
+//     }
 
-    @Override
-    public Set<String> getGroups() {
-        return groups;
-    }
+//     @Override
+//     public Set<String> getGroups() {
+//         return groups;
+//     }
 
-    @Override
-    public String getRealm() {
-        return realm;
-    }
+//     @Override
+//     public String getRealm() {
+//         return realm;
+//     }
 
-    @Override
-    public String toString() {
-        return "GroupListQuery{" +
-                "id='" + getId() + "'" +
-                "realmName='" + realmName + '\'' +
-                '}';
-    }
-}
+//     @Override
+//     public String toString() {
+//         return "GroupListQuery{" +
+//                 "id='" + getId() + "'" +
+//                 "realmName='" + realmName + '\'' +
+//                 '}';
+//     }
+// }

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RealmListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RealmListQuery.java
index 446fe58..73ea7a5 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RealmListQuery.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RealmListQuery.java
@@ -1,27 +1,27 @@
-package org.keycloak.models.cache.infinispan.entities;
+// package org.keycloak.models.cache.infinispan.entities;
 
-import java.util.HashSet;
-import java.util.Set;
+// import java.util.HashSet;
+// import java.util.Set;
 
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class RealmListQuery extends AbstractRevisioned implements RealmQuery {
-    private final Set<String> realms;
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class RealmListQuery extends AbstractRevisioned implements RealmQuery {
+//     private final Set<String> realms;
 
-    public RealmListQuery(Long revision, String id, String realm) {
-        super(revision, id);
-        realms = new HashSet<>();
-        realms.add(realm);
-    }
-    public RealmListQuery(Long revision, String id, Set<String> realms) {
-        super(revision, id);
-        this.realms = realms;
-    }
+//     public RealmListQuery(Long revision, String id, String realm) {
+//         super(revision, id);
+//         realms = new HashSet<>();
+//         realms.add(realm);
+//     }
+//     public RealmListQuery(Long revision, String id, Set<String> realms) {
+//         super(revision, id);
+//         this.realms = realms;
+//     }
 
-    @Override
-    public Set<String> getRealms() {
-        return realms;
-    }
-}
\ No newline at end of file
+//     @Override
+//     public Set<String> getRealms() {
+//         return realms;
+//     }
+// }
\ No newline at end of file

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleListQuery.java
index e924c05..874e570 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleListQuery.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleListQuery.java
@@ -1,66 +1,66 @@
-package org.keycloak.models.cache.infinispan.entities;
+// package org.keycloak.models.cache.infinispan.entities;
 
-import org.keycloak.models.RealmModel;
+// import org.keycloak.models.RealmModel;
 
-import java.util.HashSet;
-import java.util.Set;
+// import java.util.HashSet;
+// import java.util.Set;
 
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class RoleListQuery extends AbstractRevisioned implements RoleQuery, InClient {
-    private final Set<String> roles;
-    private final String realm;
-    private final String realmName;
-    private String client;
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class RoleListQuery extends AbstractRevisioned implements RoleQuery, InClient {
+//     private final Set<String> roles;
+//     private final String realm;
+//     private final String realmName;
+//     private String client;
 
-    public RoleListQuery(Long revisioned, String id, RealmModel realm, Set<String> roles) {
-        super(revisioned, id);
-        this.realm = realm.getId();
-        this.realmName = realm.getName();
-        this.roles = roles;
-    }
+//     public RoleListQuery(Long revisioned, String id, RealmModel realm, Set<String> roles) {
+//         super(revisioned, id);
+//         this.realm = realm.getId();
+//         this.realmName = realm.getName();
+//         this.roles = roles;
+//     }
 
-    public RoleListQuery(Long revisioned, String id, RealmModel realm, String role) {
-        super(revisioned, id);
-        this.realm = realm.getId();
-        this.realmName = realm.getName();
-        this.roles = new HashSet<>();
-        this.roles.add(role);
-    }
+//     public RoleListQuery(Long revisioned, String id, RealmModel realm, String role) {
+//         super(revisioned, id);
+//         this.realm = realm.getId();
+//         this.realmName = realm.getName();
+//         this.roles = new HashSet<>();
+//         this.roles.add(role);
+//     }
 
-    public RoleListQuery(Long revision, String id, RealmModel realm, Set<String> roles, String client) {
-        this(revision, id, realm, roles);
-        this.client = client;
-    }
+//     public RoleListQuery(Long revision, String id, RealmModel realm, Set<String> roles, String client) {
+//         this(revision, id, realm, roles);
+//         this.client = client;
+//     }
 
-    public RoleListQuery(Long revision, String id, RealmModel realm, String role, String client) {
-        this(revision, id, realm, role);
-        this.client = client;
-    }
+//     public RoleListQuery(Long revision, String id, RealmModel realm, String role, String client) {
+//         this(revision, id, realm, role);
+//         this.client = client;
+//     }
 
-    @Override
-    public Set<String> getRoles() {
-        return roles;
-    }
+//     @Override
+//     public Set<String> getRoles() {
+//         return roles;
+//     }
 
-    @Override
-    public String getRealm() {
-        return realm;
-    }
+//     @Override
+//     public String getRealm() {
+//         return realm;
+//     }
 
-    @Override
-    public String getClientId() {
-        return client;
-    }
+//     @Override
+//     public String getClientId() {
+//         return client;
+//     }
 
-    @Override
-    public String toString() {
-        return "RoleListQuery{" +
-                "id='" + getId() + "'" +
-                ", realmName='" + realmName + '\'' +
-                ", clientUuid='" + client + '\'' +
-                '}';
-    }
-}
+//     @Override
+//     public String toString() {
+//         return "RoleListQuery{" +
+//                 "id='" + getId() + "'" +
+//                 ", realmName='" + realmName + '\'' +
+//                 ", clientUuid='" + client + '\'' +
+//                 '}';
+//     }
+// }

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleQuery.java
index a6c22e3..8dd2e10 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleQuery.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleQuery.java
@@ -1,11 +1,11 @@
-package org.keycloak.models.cache.infinispan.entities;
+// package org.keycloak.models.cache.infinispan.entities;
 
-import java.util.Set;
+// import java.util.Set;
 
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public interface RoleQuery extends InRealm {
-    Set<String> getRoles();
-}
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public interface RoleQuery extends InRealm {
+//     Set<String> getRoles();
+// }

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/UserListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/UserListQuery.java
index c19e7aa..c918158 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/UserListQuery.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/UserListQuery.java
@@ -1,49 +1,49 @@
-package org.keycloak.models.cache.infinispan.entities;
-
-import org.keycloak.models.RealmModel;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class UserListQuery extends AbstractRevisioned implements UserQuery {
-    private final Set<String> users;
-    private final String realm;
-    private final String realmName;
-
-    public UserListQuery(Long revisioned, String id, RealmModel realm, Set<String> users) {
-        super(revisioned, id);
-        this.realm = realm.getId();
-        this.realmName = realm.getName();
-        this.users = users;
-    }
-
-    public UserListQuery(Long revisioned, String id, RealmModel realm, String user) {
-        super(revisioned, id);
-        this.realm = realm.getId();
-        this.realmName = realm.getName();
-        this.users = new HashSet<>();
-        this.users.add(user);
-    }
-
-    @Override
-    public Set<String> getUsers() {
-        return users;
-    }
-
-    @Override
-    public String getRealm() {
-        return realm;
-    }
-
-    @Override
-    public String toString() {
-        return "UserListQuery{" +
-                "id='" + getId() + "'" +
-                "realmName='" + realmName + '\'' +
-                '}';
-    }
-}
+// package org.keycloak.models.cache.infinispan.entities;
+
+// import org.keycloak.models.RealmModel;
+
+// import java.util.HashSet;
+// import java.util.Set;
+
+// /**
+//  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+//  * @version $Revision: 1 $
+//  */
+// public class UserListQuery extends AbstractRevisioned implements UserQuery {
+//     private final Set<String> users;
+//     private final String realm;
+//     private final String realmName;
+
+//     public UserListQuery(Long revisioned, String id, RealmModel realm, Set<String> users) {
+//         super(revisioned, id);
+//         this.realm = realm.getId();
+//         this.realmName = realm.getName();
+//         this.users = users;
+//     }
+
+//     public UserListQuery(Long revisioned, String id, RealmModel realm, String user) {
+//         super(revisioned, id);
+//         this.realm = realm.getId();
+//         this.realmName = realm.getName();
+//         this.users = new HashSet<>();
+//         this.users.add(user);
+//     }
+
+//     @Override
+//     public Set<String> getUsers() {
+//         return users;
+//     }
+
+//     @Override
+//     public String getRealm() {
+//         return realm;
+//     }
+
+//     @Override
+//     public String toString() {
+//         return "UserListQuery{" +
+//                 "id='" + getId() + "'" +
+//                 "realmName='" + realmName + '\'' +
+//                 '}';
+//     }
+// }

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/GroupListPredicate.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/GroupListPredicate.java
index c89c44b..57a0628 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/GroupListPredicate.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/GroupListPredicate.java
@@ -1,6 +1,6 @@
 package org.keycloak.models.cache.infinispan.stream;
 
-import org.keycloak.models.cache.infinispan.entities.GroupListQuery;
+// import org.keycloak.models.cache.infinispan.entities.GroupListQuery;
 import org.keycloak.models.cache.infinispan.entities.Revisioned;
 
 import java.io.IOException;
@@ -34,10 +34,10 @@ public class GroupListPredicate implements Predicate<Map.Entry<String, Revisione
     public boolean test(Map.Entry<String, Revisioned> entry) {
         Object value = entry.getValue();
         if (value == null) return false;
-        if (value instanceof GroupListQuery) {
-            GroupListQuery groupList = (GroupListQuery)value;
-            if (groupList.getRealm().equals(realm)) return true;
-        }
+        // if (value instanceof GroupListQuery) {
+        //     GroupListQuery groupList = (GroupListQuery)value;
+        //     if (groupList.getRealm().equals(realm)) return true;
+        // }
         return false;
     }
 

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/HasRolePredicate.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/HasRolePredicate.java
index 1a1f3c3..72b433d 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/HasRolePredicate.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/HasRolePredicate.java
@@ -1,11 +1,11 @@
 package org.keycloak.models.cache.infinispan.stream;
 
 // import org.keycloak.models.cache.infinispan.entities.CachedClient;
-import org.keycloak.models.cache.infinispan.entities.CachedClientScope;
-import org.keycloak.models.cache.infinispan.entities.CachedGroup;
-import org.keycloak.models.cache.infinispan.entities.CachedRole;
+// import org.keycloak.models.cache.infinispan.entities.CachedClientScope;
+// import org.keycloak.models.cache.infinispan.entities.CachedGroup;
+// import org.keycloak.models.cache.infinispan.entities.CachedRole;
 import org.keycloak.models.cache.infinispan.entities.Revisioned;
-import org.keycloak.models.cache.infinispan.entities.RoleQuery;
+// import org.keycloak.models.cache.infinispan.entities.RoleQuery;
 
 import java.io.IOException;
 import java.io.ObjectInput;
@@ -38,28 +38,28 @@ public class HasRolePredicate implements Predicate<Map.Entry<String, Revisioned>
     public boolean test(Map.Entry<String, Revisioned> entry) {
         Object value = entry.getValue();
         if (value == null) return false;
-        if (value instanceof CachedRole) {
-            CachedRole cachedRole = (CachedRole)value;
-            if (cachedRole.getComposites().contains(role)) return true;
-        }
-        if (value instanceof CachedGroup) {
-            CachedGroup cachedRole = (CachedGroup)value;
-            if (cachedRole.getRoleMappings(null).contains(role)) return true;
-        }
-        if (value instanceof RoleQuery) {
-            RoleQuery roleQuery = (RoleQuery)value;
-            if (roleQuery.getRoles().contains(role)) return true;
-        }
+        // if (value instanceof CachedRole) {
+        //     CachedRole cachedRole = (CachedRole)value;
+        //     if (cachedRole.getComposites().contains(role)) return true;
+        // }
+        // if (value instanceof CachedGroup) {
+        //     CachedGroup cachedRole = (CachedGroup)value;
+        //     if (cachedRole.getRoleMappings(null).contains(role)) return true;
+        // }
+        // if (value instanceof RoleQuery) {
+        //     RoleQuery roleQuery = (RoleQuery)value;
+        //     if (roleQuery.getRoles().contains(role)) return true;
+        // }
         // if (value instanceof CachedClient) {
         //     CachedClient cachedClient = (CachedClient)value;
         //     if (cachedClient.getScope().contains(role)) return true;
 
         // }
-        if (value instanceof CachedClientScope) {
-            CachedClientScope cachedClientScope = (CachedClientScope)value;
-            if (cachedClientScope.getScope().contains(role)) return true;
+        // if (value instanceof CachedClientScope) {
+        //     CachedClientScope cachedClientScope = (CachedClientScope)value;
+        //     if (cachedClientScope.getScope().contains(role)) return true;
 
-        }
+        // }
         return false;
     }
 

diff --git a/server-spi-private/src/main/java/org/keycloak/keys/PublicKeyStorageProvider.java b/server-spi-private/src/main/java/org/keycloak/keys/PublicKeyStorageProvider.java
index 437ad23..683c27b 100644
--- a/server-spi-private/src/main/java/org/keycloak/keys/PublicKeyStorageProvider.java
+++ b/server-spi-private/src/main/java/org/keycloak/keys/PublicKeyStorageProvider.java
@@ -39,6 +39,6 @@ public interface PublicKeyStorageProvider extends Provider {
     /**
      * Clears all the cached public keys, so they need to be loaded again
      */
-    void clearCache();
+    // void clearCache();
 
 }

diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java
index 98e76c0..fc1c995 100644
--- a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java
@@ -1137,10 +1137,10 @@ public class RealmAdminResource {
     public void clearKeysCache() {
         auth.realm().requireManageRealm();
 
-        PublicKeyStorageProvider cache = session.getProvider(PublicKeyStorageProvider.class);
-        if (cache != null) {
-            cache.clearCache();
-        }
+        // PublicKeyStorageProvider cache = session.getProvider(PublicKeyStorageProvider.class);
+        // if (cache != null) {
+        //     cache.clearCache();
+        // }
 
         adminEvent.operation(OperationType.ACTION).resourcePath(session.getContext().getUri()).success();
     }