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

remove RealmModel.getClientNameMap()

Browse source
This commit is contained in:
Bill Burke 2016-02-17 16:09:25 -05:00
parent 20348e5d0b
commit acf2d662c2
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -141,7 +141,7 @@ public class InfinispanCacheRealmProviderFactory implements CacheRealmProviderFa
realmCache.evictRoleById(r); realmCache.evictRoleById(r);
} }
for (String c : realm.getClients().values()) { for (String c : realm.getClients()) {
realmCache.evictClientById(c); realmCache.evictClientById(c);
} }

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

@ -591,7 +591,7 @@ public class RealmAdapter implements RealmModel {
public List<ClientModel> getClients() { public List<ClientModel> getClients() {
if (updated != null) return updated.getClients(); if (updated != null) return updated.getClients();
List<ClientModel> apps = new LinkedList<>(); List<ClientModel> apps = new LinkedList<>();
for (String id : cached.getClients().values()) { for (String id : cached.getClients()) {
ClientModel model = cacheSession.getClientById(id, this); ClientModel model = cacheSession.getClientById(id, this);
if (model == null) { if (model == null) {
throw new IllegalStateException("Cached application not found: " + id); throw new IllegalStateException("Cached application not found: " + id);

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

@ -138,7 +138,7 @@ public class LockingCacheRealmProviderFactory implements CacheRealmProviderFacto
realmCache.evictRoleById(r); realmCache.evictRoleById(r);
} }
for (String c : realm.getClients().values()) { for (String c : realm.getClients()) {
realmCache.evictClientById(c); realmCache.evictClientById(c);
} }

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

@ -42,7 +42,7 @@ public class RevisionedCachedRealm extends CachedRealm implements Revisioned {
@Override @Override
protected void cacheClients(RealmCache cache, RealmProvider delegate, RealmModel model) { protected void cacheClients(RealmCache cache, RealmProvider delegate, RealmModel model) {
for (ClientModel client : model.getClients()) { for (ClientModel client : model.getClients()) {
clients.put(client.getClientId(), client.getId()); clients.add(client.getId());
} }
} }

6
server-spi/src/main/java/org/keycloak/models/cache/entities/CachedRealm.java vendored
View file

@ -147,7 +147,7 @@ public class CachedRealm implements Serializable {
protected List<String> defaultGroups = new LinkedList<String>(); protected List<String> defaultGroups = new LinkedList<String>();
protected Set<String> groups = new HashSet<String>(); protected Set<String> groups = new HashSet<String>();
protected Map<String, String> realmRoles = new HashMap<String, String>(); protected Map<String, String> realmRoles = new HashMap<String, String>();
protected Map<String, String> clients = new HashMap<String, String>(); protected List<String> clients = new LinkedList<>();
protected List<String> clientTemplates= new LinkedList<>(); protected List<String> clientTemplates= new LinkedList<>();
protected boolean internationalizationEnabled; protected boolean internationalizationEnabled;
protected Set<String> supportedLocales; protected Set<String> supportedLocales;
@ -296,7 +296,7 @@ public class CachedRealm implements Serializable {
protected void cacheClients(RealmCache cache, RealmProvider delegate, RealmModel model) { protected void cacheClients(RealmCache cache, RealmProvider delegate, RealmModel model) {
for (ClientModel client : model.getClients()) { for (ClientModel client : model.getClients()) {
clients.put(client.getClientId(), client.getId()); clients.add(client.getId());
CachedClient cachedClient = new CachedClient(cache, delegate, model, client); CachedClient cachedClient = new CachedClient(cache, delegate, model, client);
cache.addClient(cachedClient); cache.addClient(cachedClient);
} }
@ -339,7 +339,7 @@ public class CachedRealm implements Serializable {
return realmRoles; return realmRoles;
} }
public Map<String, String> getClients() { public List<String> getClients() {
return clients; return clients;
} }