From 7bcc2c4b28cdd2f8de02482f7dc6e7bf7f2f6866 Mon Sep 17 00:00:00 2001 From: Alexander Schwartz Date: Tue, 4 Feb 2025 11:02:21 +0100 Subject: [PATCH] Remove redundant information from cache entries Closes #37034 Signed-off-by: Alexander Schwartz --- .../models/cache/infinispan/entities/ClientListQuery.java | 5 +---- .../cache/infinispan/entities/ClientScopeListQuery.java | 4 +--- .../models/cache/infinispan/entities/GroupListQuery.java | 6 +----- .../models/cache/infinispan/entities/GroupNameQuery.java | 4 +--- .../models/cache/infinispan/entities/RoleByNameQuery.java | 4 +--- .../models/cache/infinispan/entities/RoleListQuery.java | 5 +---- .../models/cache/infinispan/entities/UserListQuery.java | 5 +---- 7 files changed, 7 insertions(+), 26 deletions(-) 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 4fc650d6c2b..1cb18c42cf4 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 @@ -12,19 +12,16 @@ import java.util.Set; public class ClientListQuery extends AbstractRevisioned implements ClientQuery { private final Set clients; private final String realm; - private final String realmName; public ClientListQuery(Long revisioned, String id, RealmModel realm, Set 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); } @@ -43,7 +40,7 @@ public class ClientListQuery extends AbstractRevisioned implements ClientQuery { public String toString() { return "ClientListQuery{" + "id='" + getId() + "'" + - "realmName='" + realmName + '\'' + + "realm='" + realm + '\'' + '}'; } } diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientScopeListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientScopeListQuery.java index d19f9bd5e54..9413bcfeaa4 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientScopeListQuery.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientScopeListQuery.java @@ -24,13 +24,11 @@ import java.util.Set; public class ClientScopeListQuery extends AbstractRevisioned implements ClientScopeQuery { private final Set clientScopes; private final String realm; - private final String realmName; private String clientUuid; public ClientScopeListQuery(Long revisioned, String id, RealmModel realm, Set clientScopes) { super(revisioned, id); this.realm = realm.getId(); - this.realmName = realm.getName(); this.clientScopes = clientScopes; } @@ -58,7 +56,7 @@ public class ClientScopeListQuery extends AbstractRevisioned implements ClientSc public String toString() { return "ClientScopeListQuery{" + "id='" + getId() + "'" + - ", realmName='" + realmName + '\'' + + ", realm='" + realm + '\'' + ", clientUuid='" + clientUuid + '\'' + '}'; } 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 52ed4d693bb..0a3fcc47c8a 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 @@ -14,13 +14,11 @@ import java.util.stream.Collectors; */ public class GroupListQuery extends AbstractRevisioned implements GroupQuery { private final String realm; - private final String realmName; private final Map> searchKeys; public GroupListQuery(Long revisioned, String id, RealmModel realm, String searchKey, Set result) { super(revisioned, id); this.realm = realm.getId(); - this.realmName = realm.getName(); this.searchKeys = new HashMap<>(); this.searchKeys.put(searchKey, result); } @@ -28,7 +26,6 @@ public class GroupListQuery extends AbstractRevisioned implements GroupQuery { public GroupListQuery(Long revisioned, String id, RealmModel realm, String searchKey, Set result, GroupListQuery previous) { super(revisioned, id); this.realm = realm.getId(); - this.realmName = realm.getName(); this.searchKeys = new HashMap<>(); this.searchKeys.putAll(previous.searchKeys); this.searchKeys.put(searchKey, result); @@ -37,7 +34,6 @@ public class GroupListQuery extends AbstractRevisioned implements GroupQuery { public GroupListQuery(Long revisioned, String id, RealmModel realm, Set ids) { super(revisioned, id); this.realm = realm.getId(); - this.realmName = realm.getName(); this.searchKeys = new HashMap<>(); this.searchKeys.put(id, ids); } @@ -66,7 +62,7 @@ public class GroupListQuery extends AbstractRevisioned implements GroupQuery { public String toString() { return "GroupListQuery{" + "id='" + getId() + "'" + - "realmName='" + realmName + '\'' + + "realm='" + realm + '\'' + '}'; } } diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/GroupNameQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/GroupNameQuery.java index f40035634bc..45d6999d144 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/GroupNameQuery.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/GroupNameQuery.java @@ -21,13 +21,11 @@ import org.keycloak.models.RealmModel; public class GroupNameQuery extends AbstractRevisioned implements InRealm { private final String realm; - private final String realmName; private final String groupId; public GroupNameQuery(Long revisioned, String id, String groupId, RealmModel realm) { super(revisioned, id); this.realm = realm.getId(); - this.realmName = realm.getName(); this.groupId = groupId; } @@ -43,7 +41,7 @@ public class GroupNameQuery extends AbstractRevisioned implements InRealm { public String toString() { return "GroupNameQuery{" + "id='" + getId() + "'" + - "realmName='" + realmName + '\'' + + "realm='" + realm + '\'' + '}'; } } diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleByNameQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleByNameQuery.java index dd68205c29b..b5b5d664056 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleByNameQuery.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleByNameQuery.java @@ -27,13 +27,11 @@ import java.util.Set; public class RoleByNameQuery extends AbstractRevisioned implements RoleQuery, InClient { private final String role; private final String realm; - private final String realmName; private String client; public RoleByNameQuery(Long revisioned, String id, RealmModel realm, String role) { super(revisioned, id); this.realm = realm.getId(); - this.realmName = realm.getName(); this.role = role; } @@ -65,7 +63,7 @@ public class RoleByNameQuery extends AbstractRevisioned implements RoleQuery, In public String toString() { return "RoleNameQuery{" + "id='" + getId() + "'" + - ", realmName='" + realmName + '\'' + + ", realm='" + realm + '\'' + ", clientUuid='" + client + '\'' + '}'; } 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 e924c0595b9..1affc90a508 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 @@ -12,20 +12,17 @@ import java.util.Set; public class RoleListQuery extends AbstractRevisioned implements RoleQuery, InClient { private final Set roles; private final String realm; - private final String realmName; private String client; public RoleListQuery(Long revisioned, String id, RealmModel realm, Set 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); } @@ -59,7 +56,7 @@ public class RoleListQuery extends AbstractRevisioned implements RoleQuery, InCl public String toString() { return "RoleListQuery{" + "id='" + getId() + "'" + - ", realmName='" + realmName + '\'' + + ", realm='" + realm + '\'' + ", clientUuid='" + client + '\'' + '}'; } 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 c19e7aada1d..7dd59ff305e 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 @@ -12,19 +12,16 @@ import java.util.Set; public class UserListQuery extends AbstractRevisioned implements UserQuery { private final Set users; private final String realm; - private final String realmName; public UserListQuery(Long revisioned, String id, RealmModel realm, Set 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); } @@ -43,7 +40,7 @@ public class UserListQuery extends AbstractRevisioned implements UserQuery { public String toString() { return "UserListQuery{" + "id='" + getId() + "'" + - "realmName='" + realmName + '\'' + + "realm='" + realm + '\'' + '}'; } }