From 27ecf7f00fa2f81aff26fdc5f2becd6fb6d54a7f Mon Sep 17 00:00:00 2001
From: Alexander Schwartz <aschwart@redhat.com>
Date: Tue, 23 Aug 2022 11:22:09 +0200
Subject: [PATCH] Use session level cache and avoid resolving by ID too often

Closes #12381
---
 .../jpa/JpaMapKeycloakTransaction.java        | 20 ++++++++++++-------
 .../models/map/role/MapRoleProvider.java      | 10 ++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapKeycloakTransaction.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapKeycloakTransaction.java
index bb8334dcff..2355059075 100644
--- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapKeycloakTransaction.java
+++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapKeycloakTransaction.java
@@ -104,13 +104,19 @@ public abstract class JpaMapKeycloakTransaction<RE extends JpaRootEntity, E exte
     @Override
     public E read(String key) {
         if (key == null) return null;
-        UUID uuid = StringKeyConverter.UUIDKey.INSTANCE.fromStringSafe(key);
-        if (uuid == null) return null;
-        E e = mapToEntityDelegateUnique(
-                LockObjectsForModification.isEnabled(session, modelType) ?
-                        em.find(entityType, uuid, LockModeType.PESSIMISTIC_WRITE) :
-                        em.find(entityType, uuid)
-        );
+        E e = null;
+        if (!LockObjectsForModification.isEnabled(session, modelType)) {
+            e = cacheWithinSession.get(key);
+        }
+        if (e == null) {
+            UUID uuid = StringKeyConverter.UUIDKey.INSTANCE.fromStringSafe(key);
+            if (uuid == null) return null;
+            e = mapToEntityDelegateUnique(
+                    LockObjectsForModification.isEnabled(session, modelType) ?
+                            em.find(entityType, uuid, LockModeType.PESSIMISTIC_WRITE) :
+                            em.find(entityType, uuid)
+            );
+        }
         return e != null && isExpirableEntity && isExpired((ExpirableEntity) e, true) ? null : e;
     }
 
diff --git a/model/map/src/main/java/org/keycloak/models/map/role/MapRoleProvider.java b/model/map/src/main/java/org/keycloak/models/map/role/MapRoleProvider.java
index cb3157f60e..0be0e8bbce 100644
--- a/model/map/src/main/java/org/keycloak/models/map/role/MapRoleProvider.java
+++ b/model/map/src/main/java/org/keycloak/models/map/role/MapRoleProvider.java
@@ -191,13 +191,10 @@ public class MapRoleProvider implements RoleProvider {
                  .compare(SearchableFields.IS_CLIENT_ROLE, Operator.NE, true)
                  .compare(SearchableFields.NAME, Operator.EQ, name);
 
-        String roleId = tx.read(withCriteria(mcb))
+        return tx.read(withCriteria(mcb))
                 .map(entityToAdapterFunc(realm))
-                .map(RoleModel::getId)
                 .findFirst()
                 .orElse(null);
-        //we need to go via session.roles() not to bypass cache
-        return roleId == null ? null : session.roles().getRoleById(realm, roleId);
     }
 
     @Override
@@ -212,13 +209,10 @@ public class MapRoleProvider implements RoleProvider {
           .compare(SearchableFields.CLIENT_ID, Operator.EQ, client.getId())
           .compare(SearchableFields.NAME, Operator.EQ, name);
 
-        String roleId = tx.read(withCriteria(mcb))
+        return tx.read(withCriteria(mcb))
                 .map(entityToAdapterFunc(client.getRealm()))
-                .map(RoleModel::getId)
                 .findFirst()
                 .orElse(null);
-        //we need to go via session.roles() not to bypass cache
-        return roleId == null ? null : session.roles().getRoleById(client.getRealm(), roleId);
     }
 
     @Override