libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

reorg caching

Browse source
This commit is contained in:
Bill Burke 2016-02-19 16:38:31 -05:00
parent c45524d8d4
commit 2e64d01251
49 changed files with 185 additions and 475 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClientAdapter.java vendored
View file

@ -19,8 +19,7 @@ package org.keycloak.models.cache.infinispan;
import org.keycloak.models.*;
import org.keycloak.models.cache.CacheRealmProvider;
import org.keycloak.models.cache.RealmCache;
import org.keycloak.models.cache.entities.CachedClient;
import org.keycloak.models.cache.infinispan.entities.CachedClient;
import java.util.*;

7
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClientTemplateAdapter.java vendored
View file

@ -24,8 +24,7 @@ import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleContainerModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.cache.CacheRealmProvider;
import org.keycloak.models.cache.RealmCache;
import org.keycloak.models.cache.entities.CachedClientTemplate;
import org.keycloak.models.cache.infinispan.entities.CachedClientTemplate;
import java.util.HashMap;
import java.util.HashSet;
@ -39,14 +38,12 @@ import java.util.Set;
public class ClientTemplateAdapter implements ClientTemplateModel {
protected CacheRealmProvider cacheSession;
protected RealmModel cachedRealm;
protected RealmCache cache;
protected ClientTemplateModel updated;
protected CachedClientTemplate cached;
public ClientTemplateAdapter(RealmModel cachedRealm, CachedClientTemplate cached, CacheRealmProvider cacheSession, RealmCache cache) {
public ClientTemplateAdapter(RealmModel cachedRealm, CachedClientTemplate cached, CacheRealmProvider cacheSession) {
this.cachedRealm = cachedRealm;
this.cache = cache;
this.cacheSession = cacheSession;
this.cached = cached;
}

3
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/DefaultCacheUserProvider.java vendored
View file

@ -19,8 +19,7 @@ package org.keycloak.models.cache.infinispan;
import org.keycloak.models.*;
import org.keycloak.models.cache.CacheUserProvider;
import org.keycloak.models.cache.UserCache;
import org.keycloak.models.cache.entities.CachedUser;
import org.keycloak.models.cache.infinispan.entities.CachedUser;
import java.util.*;

2
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/GroupAdapter.java vendored
View file

@ -24,7 +24,7 @@ import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleContainerModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.cache.CacheRealmProvider;
import org.keycloak.models.cache.entities.CachedGroup;
import org.keycloak.models.cache.infinispan.entities.CachedGroup;
import java.util.HashSet;
import java.util.List;

18
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheRealmProviderFactory.java vendored
View file

@ -18,15 +18,6 @@
package org.keycloak.models.cache.infinispan;
import org.infinispan.Cache;
import org.infinispan.notifications.Listener;
import org.infinispan.notifications.cachelistener.annotation.CacheEntriesEvicted;
import org.infinispan.notifications.cachelistener.annotation.CacheEntryCreated;
import org.infinispan.notifications.cachelistener.annotation.CacheEntryInvalidated;
import org.infinispan.notifications.cachelistener.annotation.CacheEntryRemoved;
import org.infinispan.notifications.cachelistener.event.CacheEntriesEvictedEvent;
import org.infinispan.notifications.cachelistener.event.CacheEntryCreatedEvent;
import org.infinispan.notifications.cachelistener.event.CacheEntryInvalidatedEvent;
import org.infinispan.notifications.cachelistener.event.CacheEntryRemovedEvent;
import org.jboss.logging.Logger;
import org.keycloak.Config;
import org.keycloak.connections.infinispan.InfinispanConnectionProvider;
@ -34,12 +25,7 @@ import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.models.cache.CacheRealmProvider;
import org.keycloak.models.cache.CacheRealmProviderFactory;
import org.keycloak.models.cache.entities.CachedClient;
import org.keycloak.models.cache.entities.CachedRealm;
import org.keycloak.models.cache.infinispan.stream.StreamCacheRealmProvider;
import org.keycloak.models.cache.infinispan.stream.StreamRealmCache;
import java.util.concurrent.ConcurrentHashMap;
import org.keycloak.models.cache.infinispan.entities.Revisioned;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
@ -61,7 +47,7 @@ public class InfinispanCacheRealmProviderFactory implements CacheRealmProviderFa
if (realmCache == null) {
synchronized (this) {
if (realmCache == null) {
Cache<String, Object> cache = session.getProvider(InfinispanConnectionProvider.class).getCache(InfinispanConnectionProvider.REALM_CACHE_NAME);
Cache<String, Revisioned> cache = session.getProvider(InfinispanConnectionProvider.class).getCache(InfinispanConnectionProvider.REALM_CACHE_NAME);
Cache<String, Long> revisions = session.getProvider(InfinispanConnectionProvider.class).getCache(InfinispanConnectionProvider.VERSION_CACHE_NAME);
realmCache = new StreamRealmCache(cache, revisions);
}

2
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java vendored
View file

@ -28,7 +28,7 @@ import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.models.cache.CacheUserProvider;
import org.keycloak.models.cache.CacheUserProviderFactory;
import org.keycloak.models.cache.entities.CachedUser;
import org.keycloak.models.cache.infinispan.entities.CachedUser;
import java.util.concurrent.ConcurrentHashMap;

3
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanUserCache.java vendored
View file

@ -19,8 +19,7 @@ package org.keycloak.models.cache.infinispan;
import org.infinispan.Cache;
import org.jboss.logging.Logger;
import org.keycloak.models.cache.UserCache;
import org.keycloak.models.cache.entities.CachedUser;
import org.keycloak.models.cache.infinispan.entities.CachedUser;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

3
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmAdapter.java vendored
View file

@ -21,8 +21,7 @@ import org.keycloak.Config;
import org.keycloak.common.enums.SslRequired;
import org.keycloak.models.*;
import org.keycloak.models.cache.CacheRealmProvider;
import org.keycloak.models.cache.RealmCache;
import org.keycloak.models.cache.entities.CachedRealm;
import org.keycloak.models.cache.infinispan.entities.CachedRealm;
import org.keycloak.models.utils.KeycloakModelUtils;
import java.security.Key;

12
server-spi/src/main/java/org/keycloak/models/cache/RealmCache.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCache.java vendored
View file

@ -15,13 +15,13 @@
* limitations under the License.
*/
package org.keycloak.models.cache;
package org.keycloak.models.cache.infinispan;
import org.keycloak.models.cache.entities.CachedClient;
import org.keycloak.models.cache.entities.CachedClientTemplate;
import org.keycloak.models.cache.entities.CachedGroup;
import org.keycloak.models.cache.entities.CachedRealm;
import org.keycloak.models.cache.entities.CachedRole;
import org.keycloak.models.cache.infinispan.entities.CachedClient;
import org.keycloak.models.cache.infinispan.entities.CachedClientTemplate;
import org.keycloak.models.cache.infinispan.entities.CachedGroup;
import org.keycloak.models.cache.infinispan.entities.CachedRealm;
import org.keycloak.models.cache.infinispan.entities.CachedRole;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

11
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RoleAdapter.java vendored
View file

@ -21,10 +21,9 @@ import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleContainerModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.cache.CacheRealmProvider;
import org.keycloak.models.cache.RealmCache;
import org.keycloak.models.cache.entities.CachedClientRole;
import org.keycloak.models.cache.entities.CachedRealmRole;
import org.keycloak.models.cache.entities.CachedRole;
import org.keycloak.models.cache.infinispan.entities.CachedClientRole;
import org.keycloak.models.cache.infinispan.entities.CachedRealmRole;
import org.keycloak.models.cache.infinispan.entities.CachedRole;
import org.keycloak.models.utils.KeycloakModelUtils;
import java.util.HashSet;
@ -38,13 +37,11 @@ public class RoleAdapter implements RoleModel {
protected RoleModel updated;
protected CachedRole cached;
protected RealmCache cache;
protected CacheRealmProvider cacheSession;
protected RealmModel realm;
public RoleAdapter(CachedRole cached, RealmCache cache, CacheRealmProvider session, RealmModel realm) {
public RoleAdapter(CachedRole cached, CacheRealmProvider session, RealmModel realm) {
this.cached = cached;
this.cache = cache;
this.cacheSession = session;
this.realm = realm;
}

51
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/StreamCacheRealmProvider.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/StreamCacheRealmProvider.java vendored
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.keycloak.models.cache.infinispan.stream;
package org.keycloak.models.cache.infinispan;
import org.jboss.logging.Logger;
import org.keycloak.migration.MigrationModel;
@ -28,19 +28,16 @@ import org.keycloak.models.RealmModel;
import org.keycloak.models.RealmProvider;
import org.keycloak.models.RoleModel;
import org.keycloak.models.cache.CacheRealmProvider;
import org.keycloak.models.cache.entities.CachedRole;
import org.keycloak.models.cache.infinispan.ClientAdapter;
import org.keycloak.models.cache.infinispan.ClientTemplateAdapter;
import org.keycloak.models.cache.infinispan.GroupAdapter;
import org.keycloak.models.cache.infinispan.RealmAdapter;
import org.keycloak.models.cache.infinispan.RoleAdapter;
import org.keycloak.models.cache.infinispan.stream.entities.Revisioned;
import org.keycloak.models.cache.infinispan.stream.entities.RevisionedCachedClient;
import org.keycloak.models.cache.infinispan.stream.entities.RevisionedCachedClientRole;
import org.keycloak.models.cache.infinispan.stream.entities.RevisionedCachedClientTemplate;
import org.keycloak.models.cache.infinispan.stream.entities.RevisionedCachedGroup;
import org.keycloak.models.cache.infinispan.stream.entities.RevisionedCachedRealm;
import org.keycloak.models.cache.infinispan.stream.entities.RevisionedCachedRealmRole;
import org.keycloak.models.cache.infinispan.entities.CachedClient;
import org.keycloak.models.cache.infinispan.entities.CachedClientRole;
import org.keycloak.models.cache.infinispan.entities.CachedClientTemplate;
import org.keycloak.models.cache.infinispan.entities.CachedGroup;
import org.keycloak.models.cache.infinispan.entities.CachedRealm;
import org.keycloak.models.cache.infinispan.entities.CachedRealmRole;
import org.keycloak.models.cache.infinispan.entities.CachedRole;
import org.keycloak.models.cache.infinispan.entities.ClientListQuery;
import org.keycloak.models.cache.infinispan.entities.RealmListQuery;
import org.keycloak.models.cache.infinispan.entities.Revisioned;
import java.util.Collections;
import java.util.HashMap;
@ -249,7 +246,7 @@ public class StreamCacheRealmProvider implements CacheRealmProvider {
@Override
public RealmModel getRealm(String id) {
RevisionedCachedRealm cached = cache.get(id, RevisionedCachedRealm.class);
CachedRealm cached = cache.get(id, CachedRealm.class);
if (cached != null) {
logger.tracev("by id cache hit: {0}", cached.getName());
}
@ -258,7 +255,7 @@ public class StreamCacheRealmProvider implements CacheRealmProvider {
RealmModel model = getDelegate().getRealm(id);
if (model == null) return null;
if (invalidations.contains(id)) return model;
cached = new RevisionedCachedRealm(loaded, null, this, model);
cached = new CachedRealm(loaded, model);
cache.addRevisioned(cached);
} else if (invalidations.contains(id)) {
return getDelegate().getRealm(id);
@ -415,25 +412,25 @@ public class StreamCacheRealmProvider implements CacheRealmProvider {
if (model == null) return null;
if (invalidations.contains(id)) return model;
if (model.getContainer() instanceof ClientModel) {
cached = new RevisionedCachedClientRole(loaded, ((ClientModel) model.getContainer()).getId(), model, realm);
cached = new CachedClientRole(loaded, ((ClientModel) model.getContainer()).getId(), model, realm);
} else {
cached = new RevisionedCachedRealmRole(loaded, model, realm);
cached = new CachedRealmRole(loaded, model, realm);
}
cache.addRevisioned((Revisioned)cached);
cache.addRevisioned(cached);
} else if (invalidations.contains(id)) {
return getDelegate().getRoleById(id, realm);
} else if (managedRoles.containsKey(id)) {
return managedRoles.get(id);
}
RoleAdapter adapter = new RoleAdapter(cached, null, this, realm);
RoleAdapter adapter = new RoleAdapter(cached,this, realm);
managedRoles.put(id, adapter);
return adapter;
}
@Override
public GroupModel getGroupById(String id, RealmModel realm) {
RevisionedCachedGroup cached = cache.get(id, RevisionedCachedGroup.class);
CachedGroup cached = cache.get(id, CachedGroup.class);
if (cached != null && !cached.getRealm().equals(realm.getId())) {
cached = null;
}
@ -443,7 +440,7 @@ public class StreamCacheRealmProvider implements CacheRealmProvider {
GroupModel model = getDelegate().getGroupById(id, realm);
if (model == null) return null;
if (invalidations.contains(id)) return model;
cached = new RevisionedCachedGroup(loaded, realm, model);
cached = new CachedGroup(loaded, realm, model);
cache.addRevisioned(cached);
} else if (invalidations.contains(id)) {
@ -458,7 +455,7 @@ public class StreamCacheRealmProvider implements CacheRealmProvider {
@Override
public ClientModel getClientById(String id, RealmModel realm) {
RevisionedCachedClient cached = cache.get(id, RevisionedCachedClient.class);
CachedClient cached = cache.get(id, CachedClient.class);
if (cached != null && !cached.getRealm().equals(realm.getId())) {
cached = null;
}
@ -471,7 +468,7 @@ public class StreamCacheRealmProvider implements CacheRealmProvider {
ClientModel model = getDelegate().getClientById(id, realm);
if (model == null) return null;
if (invalidations.contains(id)) return model;
cached = new RevisionedCachedClient(loaded, null, getDelegate(), realm, model);
cached = new CachedClient(loaded, realm, model);
logger.tracev("adding client by id cache miss: {0}", cached.getClientId());
cache.addRevisioned(cached);
} else if (invalidations.contains(id)) {
@ -516,7 +513,7 @@ public class StreamCacheRealmProvider implements CacheRealmProvider {
@Override
public ClientTemplateModel getClientTemplateById(String id, RealmModel realm) {
RevisionedCachedClientTemplate cached = cache.get(id, RevisionedCachedClientTemplate.class);
CachedClientTemplate cached = cache.get(id, CachedClientTemplate.class);
if (cached != null && !cached.getRealm().equals(realm.getId())) {
cached = null;
}
@ -526,14 +523,14 @@ public class StreamCacheRealmProvider implements CacheRealmProvider {
ClientTemplateModel model = getDelegate().getClientTemplateById(id, realm);
if (model == null) return null;
if (invalidations.contains(id)) return model;
cached = new RevisionedCachedClientTemplate(loaded, null, getDelegate(), realm, model);
cached = new CachedClientTemplate(loaded, realm, model);
cache.addRevisioned(cached);
} else if (invalidations.contains(id)) {
return getDelegate().getClientTemplateById(id, realm);
} else if (managedClientTemplates.containsKey(id)) {
return managedClientTemplates.get(id);
}
ClientTemplateModel adapter = new ClientTemplateAdapter(realm, cached, this, null);
ClientTemplateModel adapter = new ClientTemplateAdapter(realm, cached, this);
managedClientTemplates.put(id, adapter);
return adapter;
}

73
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/StreamRealmCache.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/StreamRealmCache.java vendored
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.keycloak.models.cache.infinispan.stream;
package org.keycloak.models.cache.infinispan;
import org.infinispan.Cache;
import org.infinispan.notifications.Listener;
@ -24,12 +24,19 @@ import org.infinispan.notifications.cachelistener.annotation.CacheEntryInvalidat
import org.infinispan.notifications.cachelistener.event.CacheEntriesEvictedEvent;
import org.infinispan.notifications.cachelistener.event.CacheEntryInvalidatedEvent;
import org.jboss.logging.Logger;
import org.keycloak.models.cache.entities.CachedClient;
import org.keycloak.models.cache.entities.CachedClientTemplate;
import org.keycloak.models.cache.entities.CachedGroup;
import org.keycloak.models.cache.entities.CachedRealm;
import org.keycloak.models.cache.entities.CachedRole;
import org.keycloak.models.cache.infinispan.stream.entities.Revisioned;
import org.keycloak.models.cache.infinispan.entities.CachedClient;
import org.keycloak.models.cache.infinispan.entities.CachedClientTemplate;
import org.keycloak.models.cache.infinispan.entities.CachedGroup;
import org.keycloak.models.cache.infinispan.entities.CachedRealm;
import org.keycloak.models.cache.infinispan.entities.CachedRole;
import org.keycloak.models.cache.infinispan.entities.Revisioned;
import org.keycloak.models.cache.infinispan.stream.ClientQueryPredicate;
import org.keycloak.models.cache.infinispan.stream.ClientTemplateQueryPredicate;
import org.keycloak.models.cache.infinispan.stream.GroupQueryPredicate;
import org.keycloak.models.cache.infinispan.stream.HasRolePredicate;
import org.keycloak.models.cache.infinispan.stream.InClientPredicate;
import org.keycloak.models.cache.infinispan.stream.InRealmPredicate;
import org.keycloak.models.cache.infinispan.stream.RealmQueryPredicate;
import java.util.HashSet;
import java.util.Iterator;
@ -46,15 +53,15 @@ public class StreamRealmCache {
protected static final Logger logger = Logger.getLogger(StreamRealmCache.class);
protected final Cache<String, Long> revisions;
protected final Cache<String, Object> cache;
protected final Cache<String, Revisioned> cache;
public StreamRealmCache(Cache<String, Object> cache, Cache<String, Long> revisions) {
public StreamRealmCache(Cache<String, Revisioned> cache, Cache<String, Long> revisions) {
this.cache = cache;
this.cache.addListener(this);
this.revisions = revisions;
}
public Cache<String, Object> getCache() {
public Cache<String, Revisioned> getCache() {
return cache;
}
@ -144,11 +151,11 @@ public class StreamRealmCache {
}
public void realmInvalidation(String id, Set<String> invalidations) {
Predicate<Map.Entry<String, Object>> predicate = getRealmInvalidationPredicate(id);
Predicate<Map.Entry<String, Revisioned>> predicate = getRealmInvalidationPredicate(id);
addInvalidations(predicate, invalidations);
}
public Predicate<Map.Entry<String, Object>> getRealmInvalidationPredicate(String id) {
public Predicate<Map.Entry<String, Revisioned>> getRealmInvalidationPredicate(String id) {
return RealmQueryPredicate.create().realm(id);
}
@ -156,7 +163,7 @@ public class StreamRealmCache {
addInvalidations(getClientInvalidationPredicate(id), invalidations);
}
public Predicate<Map.Entry<String, Object>> getClientInvalidationPredicate(String id) {
public Predicate<Map.Entry<String, Revisioned>> getClientInvalidationPredicate(String id) {
return ClientQueryPredicate.create().client(id);
}
@ -165,7 +172,7 @@ public class StreamRealmCache {
}
public Predicate<Map.Entry<String, Object>> getRoleInvalidationPredicate(String id) {
public Predicate<Map.Entry<String, Revisioned>> getRoleInvalidationPredicate(String id) {
return HasRolePredicate.create().role(id);
}
@ -174,7 +181,7 @@ public class StreamRealmCache {
}
public Predicate<Map.Entry<String, Object>> getGroupInvalidationPredicate(String id) {
public Predicate<Map.Entry<String, Revisioned>> getGroupInvalidationPredicate(String id) {
return GroupQueryPredicate.create().group(id);
}
@ -183,17 +190,17 @@ public class StreamRealmCache {
}
public Predicate<Map.Entry<String, Object>> getClientTemplateInvalidationPredicate(String id) {
public Predicate<Map.Entry<String, Revisioned>> getClientTemplateInvalidationPredicate(String id) {
return ClientTemplateQueryPredicate.create().template(id);
}
public void realmRemoval(String id, Set<String> invalidations) {
Predicate<Map.Entry<String, Object>> predicate = getRealmRemovalPredicate(id);
Predicate<Map.Entry<String, Revisioned>> predicate = getRealmRemovalPredicate(id);
addInvalidations(predicate, invalidations);
}
public Predicate<Map.Entry<String, Object>> getRealmRemovalPredicate(String id) {
Predicate<Map.Entry<String, Object>> predicate = null;
public Predicate<Map.Entry<String, Revisioned>> getRealmRemovalPredicate(String id) {
Predicate<Map.Entry<String, Revisioned>> predicate = null;
predicate = RealmQueryPredicate.create().realm(id)
.or(InRealmPredicate.create().realm(id));
return predicate;
@ -203,18 +210,18 @@ public class StreamRealmCache {
addInvalidations(getClientAddedPredicate(realmId), invalidations);
}
public Predicate<Map.Entry<String, Object>> getClientAddedPredicate(String realmId) {
public Predicate<Map.Entry<String, Revisioned>> getClientAddedPredicate(String realmId) {
return ClientQueryPredicate.create().inRealm(realmId);
}
public void clientRemoval(String realmId, String id, Set<String> invalidations) {
Predicate<Map.Entry<String, Object>> predicate = null;
Predicate<Map.Entry<String, Revisioned>> predicate = null;
predicate = getClientRemovalPredicate(realmId, id);
addInvalidations(predicate, invalidations);
}
public Predicate<Map.Entry<String, Object>> getClientRemovalPredicate(String realmId, String id) {
Predicate<Map.Entry<String, Object>> predicate;
public Predicate<Map.Entry<String, Revisioned>> getClientRemovalPredicate(String realmId, String id) {
Predicate<Map.Entry<String, Revisioned>> predicate;
predicate = ClientQueryPredicate.create().inRealm(realmId)
.or(ClientQueryPredicate.create().client(id))
.or(InClientPredicate.create().client(id));
@ -226,18 +233,18 @@ public class StreamRealmCache {
}
public Predicate<Map.Entry<String, Object>> getRoleRemovalPredicate(String id) {
public Predicate<Map.Entry<String, Revisioned>> getRoleRemovalPredicate(String id) {
return getRoleInvalidationPredicate(id);
}
public void addInvalidations(Predicate<Map.Entry<String, Object>> predicate, Set<String> invalidations) {
Iterator<Map.Entry<String, Object>> it = getEntryIterator(predicate);
public void addInvalidations(Predicate<Map.Entry<String, Revisioned>> predicate, Set<String> invalidations) {
Iterator<Map.Entry<String, Revisioned>> it = getEntryIterator(predicate);
while (it.hasNext()) {
invalidations.add(it.next().getKey());
}
}
private Iterator<Map.Entry<String, Object>> getEntryIterator(Predicate<Map.Entry<String, Object>> predicate) {
private Iterator<Map.Entry<String, Revisioned>> getEntryIterator(Predicate<Map.Entry<String, Revisioned>> predicate) {
return cache
.entrySet()
.stream()
@ -249,7 +256,7 @@ public class StreamRealmCache {
if (event.isPre()) {
Object object = event.getValue();
if (object != null) {
Predicate<Map.Entry<String, Object>> predicate = getInvalidationPredicate(object);
Predicate<Map.Entry<String, Revisioned>> predicate = getInvalidationPredicate(object);
if (predicate != null) runEvictions(predicate);
}
}
@ -258,18 +265,18 @@ public class StreamRealmCache {
@CacheEntriesEvicted
public void cacheEvicted(CacheEntriesEvictedEvent<String, Object> event) {
for (Object object : event.getEntries().values()) {
Predicate<Map.Entry<String, Object>> predicate = getEvictionPredicate(object);
Predicate<Map.Entry<String, Revisioned>> predicate = getEvictionPredicate(object);
if (predicate != null) runEvictions(predicate);
}
}
public void runEvictions(Predicate<Map.Entry<String, Object>> current) {
public void runEvictions(Predicate<Map.Entry<String, Revisioned>> current) {
Set<String> evictions = new HashSet<>();
addInvalidations(current, evictions);
for (String key : evictions) cache.evict(key);
}
protected Predicate<Map.Entry<String, Object>> getEvictionPredicate(Object object) {
protected Predicate<Map.Entry<String, Revisioned>> getEvictionPredicate(Object object) {
if (object instanceof CachedRealm) {
CachedRealm cached = (CachedRealm)object;
return getRealmInvalidationPredicate(cached.getId());
@ -288,13 +295,13 @@ public class StreamRealmCache {
}
return null;
}
protected Predicate<Map.Entry<String, Object>> getInvalidationPredicate(Object object) {
protected Predicate<Map.Entry<String, Revisioned>> getInvalidationPredicate(Object object) {
if (object instanceof CachedRealm) {
CachedRealm cached = (CachedRealm)object;
return getRealmRemovalPredicate(cached.getId());
} else if (object instanceof CachedClient) {
CachedClient cached = (CachedClient)object;
Predicate<Map.Entry<String, Object>> predicate = getClientRemovalPredicate(cached.getRealm(), cached.getId());
Predicate<Map.Entry<String, Revisioned>> predicate = getClientRemovalPredicate(cached.getRealm(), cached.getId());
for (String roleId : cached.getRoles().values()) {
predicate.or(getRoleRemovalPredicate(roleId));
}

2
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/UpdateCounter.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UpdateCounter.java vendored
View file

@ -1,4 +1,4 @@
package org.keycloak.models.cache.infinispan.stream;
package org.keycloak.models.cache.infinispan;
import java.util.concurrent.atomic.AtomicLong;

2
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserAdapter.java vendored
View file

@ -19,7 +19,7 @@ package org.keycloak.models.cache.infinispan;
import org.keycloak.models.*;
import org.keycloak.models.cache.CacheUserProvider;
import org.keycloak.models.cache.entities.CachedUser;
import org.keycloak.models.cache.infinispan.entities.CachedUser;
import org.keycloak.models.utils.KeycloakModelUtils;
import java.util.*;

4
server-spi/src/main/java/org/keycloak/models/cache/UserCache.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserCache.java vendored
View file

@ -15,9 +15,9 @@
* limitations under the License.
*/
package org.keycloak.models.cache;
package org.keycloak.models.cache.infinispan;
import org.keycloak.models.cache.entities.CachedUser;
import org.keycloak.models.cache.infinispan.entities.CachedUser;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

6
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/entities/AbstractRevisioned.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/AbstractRevisioned.java vendored
View file

@ -1,10 +1,12 @@
package org.keycloak.models.cache.infinispan.stream.entities;
package org.keycloak.models.cache.infinispan.entities;
import java.io.Serializable;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class AbstractRevisioned implements Revisioned {
public class AbstractRevisioned implements Revisioned, Serializable {
private String id;
private Long revision;

23
server-spi/src/main/java/org/keycloak/models/cache/entities/CachedClient.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedClient.java vendored
View file

@ -15,14 +15,14 @@
* limitations under the License.
*/
package org.keycloak.models.cache.entities;
package org.keycloak.models.cache.infinispan.entities;
import org.keycloak.models.ClientModel;
import org.keycloak.models.ProtocolMapperModel;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RealmProvider;
import org.keycloak.models.RoleModel;
import org.keycloak.models.cache.RealmCache;
import org.keycloak.models.cache.infinispan.RealmCache;
import java.io.Serializable;
import java.util.HashMap;
@ -37,9 +37,7 @@ import java.util.TreeMap;
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class CachedClient implements Serializable {
protected String id;
public class CachedClient extends AbstractRevisioned implements InRealm {
protected String clientId;
protected String name;
protected String description;
@ -77,8 +75,8 @@ public class CachedClient implements Serializable {
protected boolean useTemplateConfig;
protected boolean useTemplateMappers;
public CachedClient(RealmCache cache, RealmProvider delegate, RealmModel realm, ClientModel model) {
id = model.getId();
public CachedClient(Long revision, RealmModel realm, ClientModel model) {
super(revision, model.getId());
clientAuthenticatorType = model.getClientAuthenticatorType();
secret = model.getSecret();
registrationToken = model.getRegistrationToken();
@ -112,10 +110,10 @@ public class CachedClient implements Serializable {
implicitFlowEnabled = model.isImplicitFlowEnabled();
directAccessGrantsEnabled = model.isDirectAccessGrantsEnabled();
serviceAccountsEnabled = model.isServiceAccountsEnabled();
cacheRoles(cache, realm, model);
cacheRoles(model);
nodeReRegistrationTimeout = model.getNodeReRegistrationTimeout();
registeredNodes = new TreeMap<String, Integer>(model.getRegisteredNodes());
registeredNodes = new TreeMap<>(model.getRegisteredNodes());
if (model.getClientTemplate() != null) {
clientTemplate = model.getClientTemplate().getId();
}
@ -124,17 +122,12 @@ public class CachedClient implements Serializable {
useTemplateScope = model.useTemplateScope();
}
protected void cacheRoles(RealmCache cache, RealmModel realm, ClientModel model) {
protected void cacheRoles(ClientModel model) {
for (RoleModel role : model.getRoles()) {
roles.put(role.getName(), role.getId());
cache.addRole(new CachedClientRole(id, role, realm));
}
}
public String getId() {
return id;
}
public String getClientId() {
return clientId;
}

8
server-spi/src/main/java/org/keycloak/models/cache/entities/CachedClientRole.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedClientRole.java vendored
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.keycloak.models.cache.entities;
package org.keycloak.models.cache.infinispan.entities;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;
@ -24,12 +24,12 @@ import org.keycloak.models.RoleModel;
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class CachedClientRole extends CachedRole {
public class CachedClientRole extends CachedRole implements InClient {
private final String clientId;
public CachedClientRole(String clientId, RoleModel model, RealmModel realm) {
super(model, realm);
public CachedClientRole(Long revision, String clientId, RoleModel model, RealmModel realm) {
super(revision, model, realm);
this.clientId = clientId;
}

19
server-spi/src/main/java/org/keycloak/models/cache/entities/CachedClientTemplate.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedClientTemplate.java vendored
View file

@ -15,14 +15,14 @@
* limitations under the License.
*/
package org.keycloak.models.cache.entities;
package org.keycloak.models.cache.infinispan.entities;
import org.keycloak.models.ClientTemplateModel;
import org.keycloak.models.ProtocolMapperModel;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RealmProvider;
import org.keycloak.models.RoleModel;
import org.keycloak.models.cache.RealmCache;
import org.keycloak.models.cache.infinispan.RealmCache;
import java.io.Serializable;
import java.util.HashMap;
@ -34,9 +34,8 @@ import java.util.Set;
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class CachedClientTemplate implements Serializable {
public class CachedClientTemplate extends AbstractRevisioned implements InRealm {
private String id;
private String name;
private String description;
private String realm;
@ -50,12 +49,12 @@ public class CachedClientTemplate implements Serializable {
private boolean implicitFlowEnabled;
private boolean directAccessGrantsEnabled;
private boolean serviceAccountsEnabled;
private Set<String> scope = new HashSet<String>();
private Set<String> scope = new HashSet<>();
private Set<ProtocolMapperModel> protocolMappers = new HashSet<ProtocolMapperModel>();
private Map<String, String> attributes = new HashMap<String, String>();
private Map<String, String> attributes = new HashMap<>();
public CachedClientTemplate(RealmCache cache, RealmProvider delegate, RealmModel realm, ClientTemplateModel model) {
id = model.getId();
public CachedClientTemplate(Long revision, RealmModel realm, ClientTemplateModel model) {
super(revision, model.getId());
name = model.getName();
description = model.getDescription();
this.realm = realm.getId();
@ -77,10 +76,6 @@ public class CachedClientTemplate implements Serializable {
directAccessGrantsEnabled = model.isDirectAccessGrantsEnabled();
serviceAccountsEnabled = model.isServiceAccountsEnabled();
}
public String getId() {
return id;
}
public String getName() {
return name;

13
server-spi/src/main/java/org/keycloak/models/cache/entities/CachedGroup.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedGroup.java vendored
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.keycloak.models.cache.entities;
package org.keycloak.models.cache.infinispan.entities;
import org.keycloak.common.util.MultivaluedHashMap;
import org.keycloak.models.GroupModel;
@ -30,8 +30,7 @@ import java.util.Set;
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class CachedGroup implements Serializable {
private String id;
public class CachedGroup extends AbstractRevisioned implements InRealm {
private String realm;
private String name;
private String parentId;
@ -39,8 +38,8 @@ public class CachedGroup implements Serializable {
private Set<String> roleMappings = new HashSet<>();
private Set<String> subGroups = new HashSet<>();
public CachedGroup(RealmModel realm, GroupModel group) {
this.id = group.getId();
public CachedGroup(Long revision, RealmModel realm, GroupModel group) {
super(revision, group.getId());
this.realm = realm.getId();
this.name = group.getName();
this.parentId = group.getParentId();
@ -57,10 +56,6 @@ public class CachedGroup implements Serializable {
}
}
public String getId() {
return id;
}
public String getRealm() {
return realm;
}

36
server-spi/src/main/java/org/keycloak/models/cache/entities/CachedRealm.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealm.java vendored
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.keycloak.models.cache.entities;
package org.keycloak.models.cache.infinispan.entities;
import org.keycloak.common.enums.SslRequired;
import org.keycloak.models.AuthenticationExecutionModel;
@ -35,7 +35,7 @@ import org.keycloak.models.RequiredCredentialModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.UserFederationMapperModel;
import org.keycloak.models.UserFederationProviderModel;
import org.keycloak.models.cache.RealmCache;
import org.keycloak.models.cache.infinispan.RealmCache;
import org.keycloak.common.util.MultivaluedHashMap;
import java.io.Serializable;
@ -56,9 +56,8 @@ import java.util.Set;
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class CachedRealm implements Serializable {
public class CachedRealm extends AbstractRevisioned {
protected String id;
protected String name;
protected String displayName;
protected String displayNameHtml;
@ -155,11 +154,8 @@ public class CachedRealm implements Serializable {
protected MultivaluedHashMap<String, IdentityProviderMapperModel> identityProviderMappers = new MultivaluedHashMap<>();
protected Set<IdentityProviderMapperModel> identityProviderMapperSet;
public CachedRealm() {
}
public CachedRealm(RealmCache cache, RealmProvider delegate, RealmModel model) {
id = model.getId();
public CachedRealm(Long revision, RealmModel model) {
super(revision, model.getId());
name = model.getName();
displayName = model.getDisplayName();
displayNameHtml = model.getDisplayNameHtml();
@ -244,11 +240,11 @@ public class CachedRealm implements Serializable {
ClientModel masterAdminClient = model.getMasterAdminClient();
this.masterAdminClient = (masterAdminClient != null) ? masterAdminClient.getId() : null;
cacheRealmRoles(cache, model);
cacheRealmRoles(model);
cacheClients(cache, delegate, model);
cacheClients(model);
cacheClientTemplates(cache, delegate, model);
cacheClientTemplates(model);
internationalizationEnabled = model.isInternationalizationEnabled();
supportedLocales = model.getSupportedLocales();
@ -286,35 +282,25 @@ public class CachedRealm implements Serializable {
}
protected void cacheClientTemplates(RealmCache cache, RealmProvider delegate, RealmModel model) {
protected void cacheClientTemplates(RealmModel model) {
for (ClientTemplateModel template : model.getClientTemplates()) {
clientTemplates.add(template.getId());
CachedClientTemplate cachedClient = new CachedClientTemplate(cache, delegate, model, template);
cache.addClientTemplate(cachedClient);
}
}
protected void cacheClients(RealmCache cache, RealmProvider delegate, RealmModel model) {
protected void cacheClients(RealmModel model) {
for (ClientModel client : model.getClients()) {
clients.add(client.getId());
CachedClient cachedClient = new CachedClient(cache, delegate, model, client);
cache.addClient(cachedClient);
}
}
protected void cacheRealmRoles(RealmCache cache, RealmModel model) {
protected void cacheRealmRoles(RealmModel model) {
for (RoleModel role : model.getRoles()) {
realmRoles.put(role.getName(), role.getId());
CachedRole cachedRole = new CachedRealmRole(role, model);
cache.addRole(cachedRole);
}
}
public String getId() {
return id;
}
public String getMasterAdminClient() {
return masterAdminClient;
}

6
server-spi/src/main/java/org/keycloak/models/cache/entities/CachedRealmRole.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealmRole.java vendored
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.keycloak.models.cache.entities;
package org.keycloak.models.cache.infinispan.entities;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;
@ -27,8 +27,8 @@ import org.keycloak.models.RoleModel;
public class CachedRealmRole extends CachedRole {
public CachedRealmRole(RoleModel model, RealmModel realm) {
super(model, realm);
public CachedRealmRole(Long revision, RoleModel model, RealmModel realm) {
super(revision, model, realm);
}

13
server-spi/src/main/java/org/keycloak/models/cache/entities/CachedRole.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRole.java vendored
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.keycloak.models.cache.entities;
package org.keycloak.models.cache.infinispan.entities;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;
@ -28,9 +28,8 @@ import java.util.Set;
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class CachedRole implements Serializable {
public class CachedRole extends AbstractRevisioned implements InRealm {
final protected String id;
final protected String name;
final protected String realm;
final protected String description;
@ -38,10 +37,10 @@ public class CachedRole implements Serializable {
final protected boolean composite;
final protected Set<String> composites = new HashSet<String>();
public CachedRole(RoleModel model, RealmModel realm) {
public CachedRole(Long revision, RoleModel model, RealmModel realm) {
super(revision, model.getId());
composite = model.isComposite();
description = model.getDescription();
id = model.getId();
name = model.getName();
scopeParamRequired = model.isScopeParamRequired();
this.realm = realm.getId();
@ -53,10 +52,6 @@ public class CachedRole implements Serializable {
}
public String getId() {
return id;
}
public String getName() {
return name;
}

2
server-spi/src/main/java/org/keycloak/models/cache/entities/CachedUser.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUser.java vendored
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.keycloak.models.cache.entities;
package org.keycloak.models.cache.infinispan.entities;
import org.keycloak.models.GroupModel;
import org.keycloak.models.RealmModel;

3
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/ClientListQuery.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientListQuery.java vendored
View file

@ -1,7 +1,6 @@
package org.keycloak.models.cache.infinispan.stream;
package org.keycloak.models.cache.infinispan.entities;
import org.keycloak.models.RealmModel;
import org.keycloak.models.cache.infinispan.stream.entities.AbstractRevisioned;
import java.util.HashSet;
import java.util.Set;

5
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/ClientQuery.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientQuery.java vendored
View file

@ -1,8 +1,7 @@
package org.keycloak.models.cache.infinispan.stream;
package org.keycloak.models.cache.infinispan.entities;
import org.keycloak.models.cache.infinispan.stream.entities.InRealm;
import org.keycloak.models.cache.infinispan.entities.InRealm;
import java.util.List;
import java.util.Set;
/**

4
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/ClientTemplateQuery.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientTemplateQuery.java vendored
View file

@ -1,6 +1,6 @@
package org.keycloak.models.cache.infinispan.stream;
package org.keycloak.models.cache.infinispan.entities;
import org.keycloak.models.cache.infinispan.stream.entities.InRealm;
import org.keycloak.models.cache.infinispan.entities.InRealm;
import java.util.Set;

4
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/GroupQuery.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/GroupQuery.java vendored
View file

@ -1,6 +1,6 @@
package org.keycloak.models.cache.infinispan.stream;
package org.keycloak.models.cache.infinispan.entities;
import org.keycloak.models.cache.infinispan.stream.entities.InRealm;
import org.keycloak.models.cache.infinispan.entities.InRealm;
import java.util.Set;

2
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/entities/InClient.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/InClient.java vendored
View file

@ -1,4 +1,4 @@
package org.keycloak.models.cache.infinispan.stream.entities;
package org.keycloak.models.cache.infinispan.entities;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

2
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/entities/InRealm.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/InRealm.java vendored
View file

@ -1,4 +1,4 @@
package org.keycloak.models.cache.infinispan.stream.entities;
package org.keycloak.models.cache.infinispan.entities;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

4
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/RealmListQuery.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RealmListQuery.java vendored
View file

@ -1,6 +1,4 @@
package org.keycloak.models.cache.infinispan.stream;
import org.keycloak.models.cache.infinispan.stream.entities.AbstractRevisioned;
package org.keycloak.models.cache.infinispan.entities;
import java.util.HashSet;
import java.util.Set;

4
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/RealmQuery.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RealmQuery.java vendored
View file

@ -1,6 +1,4 @@
package org.keycloak.models.cache.infinispan.stream;
import org.keycloak.models.cache.infinispan.stream.entities.InRealm;
package org.keycloak.models.cache.infinispan.entities;
import java.util.Set;

2
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/entities/Revisioned.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/Revisioned.java vendored
View file

@ -1,4 +1,4 @@
package org.keycloak.models.cache.infinispan.stream.entities;
package org.keycloak.models.cache.infinispan.entities;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

4
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/RoleQuery.java → model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleQuery.java vendored
View file

@ -1,6 +1,6 @@
package org.keycloak.models.cache.infinispan.stream;
package org.keycloak.models.cache.infinispan.entities;
import org.keycloak.models.cache.infinispan.stream.entities.InRealm;
import org.keycloak.models.cache.infinispan.entities.InRealm;
import java.util.Set;

6
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/ClientQueryPredicate.java vendored
View file

@ -1,6 +1,8 @@
package org.keycloak.models.cache.infinispan.stream;
import org.jboss.logging.Logger;
import org.keycloak.models.cache.infinispan.entities.ClientQuery;
import org.keycloak.models.cache.infinispan.entities.Revisioned;
import java.io.Serializable;
import java.util.Map;
@ -10,7 +12,7 @@ import java.util.function.Predicate;
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class ClientQueryPredicate implements Predicate<Map.Entry<String, Object>>, Serializable {
public class ClientQueryPredicate implements Predicate<Map.Entry<String, Revisioned>>, Serializable {
protected static final Logger logger = Logger.getLogger(ClientQueryPredicate.class);
private String client;
private String inRealm;
@ -34,7 +36,7 @@ public class ClientQueryPredicate implements Predicate<Map.Entry<String, Object>
@Override
public boolean test(Map.Entry<String, Object> entry) {
public boolean test(Map.Entry<String, Revisioned> entry) {
Object value = entry.getValue();
if (value == null) return false;
if (!(value instanceof ClientQuery)) return false;

7
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/ClientTemplateQueryPredicate.java vendored
View file

@ -1,5 +1,8 @@
package org.keycloak.models.cache.infinispan.stream;
import org.keycloak.models.cache.infinispan.entities.ClientTemplateQuery;
import org.keycloak.models.cache.infinispan.entities.Revisioned;
import java.io.Serializable;
import java.util.Map;
import java.util.function.Predicate;
@ -8,7 +11,7 @@ import java.util.function.Predicate;
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class ClientTemplateQueryPredicate implements Predicate<Map.Entry<String, Object>>, Serializable {
public class ClientTemplateQueryPredicate implements Predicate<Map.Entry<String, Revisioned>>, Serializable {
private String template;
public static ClientTemplateQueryPredicate create() {
@ -25,7 +28,7 @@ public class ClientTemplateQueryPredicate implements Predicate<Map.Entry<String,
@Override
public boolean test(Map.Entry<String, Object> entry) {
public boolean test(Map.Entry<String, Revisioned> entry) {
Object value = entry.getValue();
if (value == null) return false;
if (!(value instanceof ClientTemplateQuery)) return false;

7
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/GroupQueryPredicate.java vendored
View file

@ -1,5 +1,8 @@
package org.keycloak.models.cache.infinispan.stream;
import org.keycloak.models.cache.infinispan.entities.GroupQuery;
import org.keycloak.models.cache.infinispan.entities.Revisioned;
import java.io.Serializable;
import java.util.Map;
import java.util.function.Predicate;
@ -8,7 +11,7 @@ import java.util.function.Predicate;
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class GroupQueryPredicate implements Predicate<Map.Entry<String, Object>>, Serializable {
public class GroupQueryPredicate implements Predicate<Map.Entry<String, Revisioned>>, Serializable {
private String group;
public static GroupQueryPredicate create() {
@ -25,7 +28,7 @@ public class GroupQueryPredicate implements Predicate<Map.Entry<String, Object>>
@Override
public boolean test(Map.Entry<String, Object> entry) {
public boolean test(Map.Entry<String, Revisioned> entry) {
Object value = entry.getValue();
if (value == null) return false;
if (!(value instanceof GroupQuery)) return false;

9
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/HasRolePredicate.java vendored
View file

@ -1,7 +1,8 @@
package org.keycloak.models.cache.infinispan.stream;
import org.keycloak.models.cache.entities.CachedGroup;
import org.keycloak.models.cache.entities.CachedRole;
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 java.io.Serializable;
import java.util.Map;
@ -11,7 +12,7 @@ import java.util.function.Predicate;
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class HasRolePredicate implements Predicate<Map.Entry<String, Object>>, Serializable {
public class HasRolePredicate implements Predicate<Map.Entry<String, Revisioned>>, Serializable {
private String role;
public static HasRolePredicate create() {
@ -24,7 +25,7 @@ public class HasRolePredicate implements Predicate<Map.Entry<String, Object>>, S
}
@Override
public boolean test(Map.Entry<String, Object> entry) {
public boolean test(Map.Entry<String, Revisioned> entry) {
Object value = entry.getValue();
if (value == null) return false;
if (value instanceof CachedRole) {

8
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/InClientPredicate.java vendored
View file

@ -1,7 +1,7 @@
package org.keycloak.models.cache.infinispan.stream;
import org.keycloak.models.cache.infinispan.stream.entities.InClient;
import org.keycloak.models.cache.infinispan.stream.entities.InRealm;
import org.keycloak.models.cache.infinispan.entities.InClient;
import org.keycloak.models.cache.infinispan.entities.Revisioned;
import java.io.Serializable;
import java.util.Map;
@ -11,7 +11,7 @@ import java.util.function.Predicate;
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class InClientPredicate implements Predicate<Map.Entry<String, Object>>, Serializable {
public class InClientPredicate implements Predicate<Map.Entry<String, Revisioned>>, Serializable {
private String clientId;
public static InClientPredicate create() {
@ -24,7 +24,7 @@ public class InClientPredicate implements Predicate<Map.Entry<String, Object>>,
}
@Override
public boolean test(Map.Entry<String, Object> entry) {
public boolean test(Map.Entry<String, Revisioned> entry) {
Object value = entry.getValue();
if (value == null) return false;
if (!(value instanceof InClient)) return false;

7
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/InRealmPredicate.java vendored
View file

@ -1,6 +1,7 @@
package org.keycloak.models.cache.infinispan.stream;
import org.keycloak.models.cache.infinispan.stream.entities.InRealm;
import org.keycloak.models.cache.infinispan.entities.InRealm;
import org.keycloak.models.cache.infinispan.entities.Revisioned;
import java.io.Serializable;
import java.util.Map;
@ -10,7 +11,7 @@ import java.util.function.Predicate;
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class InRealmPredicate implements Predicate<Map.Entry<String, Object>>, Serializable {
public class InRealmPredicate implements Predicate<Map.Entry<String, Revisioned>>, Serializable {
private String realm;
public static InRealmPredicate create() {
@ -23,7 +24,7 @@ public class InRealmPredicate implements Predicate<Map.Entry<String, Object>>, S
}
@Override
public boolean test(Map.Entry<String, Object> entry) {
public boolean test(Map.Entry<String, Revisioned> entry) {
Object value = entry.getValue();
if (value == null) return false;
if (!(value instanceof InRealm)) return false;

7
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/RealmQueryPredicate.java vendored
View file

@ -1,5 +1,8 @@
package org.keycloak.models.cache.infinispan.stream;
import org.keycloak.models.cache.infinispan.entities.RealmQuery;
import org.keycloak.models.cache.infinispan.entities.Revisioned;
import java.io.Serializable;
import java.util.Map;
import java.util.function.Predicate;
@ -8,7 +11,7 @@ import java.util.function.Predicate;
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class RealmQueryPredicate implements Predicate<Map.Entry<String, Object>>, Serializable {
public class RealmQueryPredicate implements Predicate<Map.Entry<String, Revisioned>>, Serializable {
private String realm;
public static RealmQueryPredicate create() {
@ -25,7 +28,7 @@ public class RealmQueryPredicate implements Predicate<Map.Entry<String, Object>>
@Override
public boolean test(Map.Entry<String, Object> entry) {
public boolean test(Map.Entry<String, Revisioned> entry) {
Object value = entry.getValue();
if (value == null) return false;
if (!(value instanceof RealmQuery)) return false;

7
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/RoleQueryPredicate.java vendored
View file

@ -1,5 +1,8 @@
package org.keycloak.models.cache.infinispan.stream;
import org.keycloak.models.cache.infinispan.entities.Revisioned;
import org.keycloak.models.cache.infinispan.entities.RoleQuery;
import java.io.Serializable;
import java.util.Map;
import java.util.function.Predicate;
@ -8,7 +11,7 @@ import java.util.function.Predicate;
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class RoleQueryPredicate implements Predicate<Map.Entry<String, Object>>, Serializable {
public class RoleQueryPredicate implements Predicate<Map.Entry<String, Revisioned>>, Serializable {
private String role;
public static RoleQueryPredicate create() {
@ -25,7 +28,7 @@ public class RoleQueryPredicate implements Predicate<Map.Entry<String, Object>>,
@Override
public boolean test(Map.Entry<String, Object> entry) {
public boolean test(Map.Entry<String, Revisioned> entry) {
Object value = entry.getValue();
if (value == null) return false;
if (!(value instanceof RoleQuery)) return false;

39
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/entities/RevisionedCachedClient.java vendored
View file

@ -1,39 +0,0 @@
package org.keycloak.models.cache.infinispan.stream.entities;
import org.keycloak.models.ClientModel;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RealmProvider;
import org.keycloak.models.RoleModel;
import org.keycloak.models.cache.RealmCache;
import org.keycloak.models.cache.entities.CachedClient;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class RevisionedCachedClient extends CachedClient implements Revisioned, InRealm {
public RevisionedCachedClient(Long revision, RealmCache cache, RealmProvider delegate, RealmModel realm, ClientModel model) {
super(cache, delegate, realm, model);
this.revision = revision;
}
private Long revision;
@Override
public Long getRevision() {
return revision;
}
@Override
public void setRevision(Long revision) {
this.revision = revision;
}
@Override
protected void cacheRoles(RealmCache cache, RealmModel realm, ClientModel model) {
for (RoleModel role : model.getRoles()) {
roles.put(role.getName(), role.getId());
}
}
}

31
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/entities/RevisionedCachedClientRole.java vendored
View file

@ -1,31 +0,0 @@
package org.keycloak.models.cache.infinispan.stream.entities;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.cache.entities.CachedClientRole;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class RevisionedCachedClientRole extends CachedClientRole implements Revisioned, InClient {
public RevisionedCachedClientRole(Long revision, String idClient, RoleModel model, RealmModel realm) {
super(idClient, model, realm);
this.revision = revision;
}
private Long revision;
@Override
public Long getRevision() {
return revision;
}
@Override
public void setRevision(Long revision) {
this.revision = revision;
}
}

33
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/entities/RevisionedCachedClientTemplate.java vendored
View file

@ -1,33 +0,0 @@
package org.keycloak.models.cache.infinispan.stream.entities;
import org.keycloak.models.ClientTemplateModel;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RealmProvider;
import org.keycloak.models.cache.RealmCache;
import org.keycloak.models.cache.entities.CachedClientTemplate;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class RevisionedCachedClientTemplate extends CachedClientTemplate implements Revisioned, InRealm {
public RevisionedCachedClientTemplate(Long revision, RealmCache cache, RealmProvider delegate, RealmModel realm, ClientTemplateModel model) {
super(cache, delegate, realm, model);
this.revision = revision;
}
private Long revision;
@Override
public Long getRevision() {
return revision;
}
@Override
public void setRevision(Long revision) {
this.revision = revision;
}
}

30
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/entities/RevisionedCachedGroup.java vendored
View file

@ -1,30 +0,0 @@
package org.keycloak.models.cache.infinispan.stream.entities;
import org.keycloak.models.GroupModel;
import org.keycloak.models.RealmModel;
import org.keycloak.models.cache.entities.CachedGroup;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class RevisionedCachedGroup extends CachedGroup implements Revisioned, InRealm {
public RevisionedCachedGroup(Long revision, RealmModel realm, GroupModel group) {
super(realm, group);
this.revision = revision;
}
private Long revision;
@Override
public Long getRevision() {
return revision;
}
@Override
public void setRevision(Long revision) {
this.revision = revision;
}
}

54
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/entities/RevisionedCachedRealm.java vendored
View file

@ -1,54 +0,0 @@
package org.keycloak.models.cache.infinispan.stream.entities;
import org.keycloak.models.ClientModel;
import org.keycloak.models.ClientTemplateModel;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RealmProvider;
import org.keycloak.models.RoleModel;
import org.keycloak.models.cache.RealmCache;
import org.keycloak.models.cache.entities.CachedRealm;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class RevisionedCachedRealm extends CachedRealm implements Revisioned {
public RevisionedCachedRealm(Long revision, RealmCache cache, RealmProvider delegate, RealmModel model) {
super(cache, delegate, model);
this.revision = revision;
}
private Long revision;
@Override
public Long getRevision() {
return revision;
}
@Override
public void setRevision(Long revision) {
this.revision = revision;
}
@Override
protected void cacheClientTemplates(RealmCache cache, RealmProvider delegate, RealmModel model) {
for (ClientTemplateModel template : model.getClientTemplates()) {
clientTemplates.add(template.getId());
}
}
@Override
protected void cacheClients(RealmCache cache, RealmProvider delegate, RealmModel model) {
for (ClientModel client : model.getClients()) {
clients.add(client.getId());
}
}
@Override
protected void cacheRealmRoles(RealmCache cache, RealmModel model) {
for (RoleModel role : model.getRoles()) {
realmRoles.put(role.getName(), role.getId());
}
}
}

30
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/entities/RevisionedCachedRealmRole.java vendored
View file

@ -1,30 +0,0 @@
package org.keycloak.models.cache.infinispan.stream.entities;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.cache.entities.CachedRealmRole;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class RevisionedCachedRealmRole extends CachedRealmRole implements Revisioned, InRealm {
public RevisionedCachedRealmRole(Long revision, RoleModel model, RealmModel realm) {
super(model, realm);
this.revision = revision;
}
private Long revision;
@Override
public Long getRevision() {
return revision;
}
@Override
public void setRevision(Long revision) {
this.revision = revision;
}
}

29
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/entities/RevisionedCachedUser.java vendored
View file

@ -1,29 +0,0 @@
package org.keycloak.models.cache.infinispan.stream.entities;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.cache.entities.CachedUser;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class RevisionedCachedUser extends CachedUser implements Revisioned, InRealm {
public RevisionedCachedUser(Long revision, RealmModel realm, UserModel user) {
super(realm, user);
this.revision = revision;
}
private Long revision;
@Override
public Long getRevision() {
return revision;
}
@Override
public void setRevision(Long revision) {
this.revision = revision;
}
}