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

Map Store Removal: Remove obsolete KeycloakModelUtils.isRealmProviderJpa method

Browse source 
Closes #27445

Signed-off-by: vramik <vramik@redhat.com>
This commit is contained in:
vramik 2024-03-01 18:35:55 +01:00 committed by Alexander Schwartz
parent f1e7c572da
commit 7adcc98c6c
2 changed files with 13 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProvider.java
View file

@ -34,7 +34,6 @@ import org.keycloak.models.RealmModel;
import org.keycloak.models.jpa.entities.RealmAttributeEntity; import org.keycloak.models.jpa.entities.RealmAttributeEntity;
import org.keycloak.models.jpa.entities.RealmAttributes; import org.keycloak.models.jpa.entities.RealmAttributes;
import org.keycloak.models.jpa.entities.RealmEntity; import org.keycloak.models.jpa.entities.RealmEntity;
import org.keycloak.models.utils.KeycloakModelUtils;
import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManager;
import jakarta.persistence.TypedQuery; import jakarta.persistence.TypedQuery;
@ -84,34 +83,23 @@ public class JpaEventStoreProvider implements EventStoreProvider {
@Override @Override
public void clearExpiredEvents() { public void clearExpiredEvents() {
// By default, realm provider is always "jpa", so we can optimize and delete all events in single SQL, assuming that realms are saved in the DB as well.
// Fallback to model API just with different realm provider than "jpa" (This is never the case in standard Keycloak installations)
int numDeleted = 0; int numDeleted = 0;
long currentTimeMillis = Time.currentTimeMillis(); long currentTimeMillis = Time.currentTimeMillis();
if (KeycloakModelUtils.isRealmProviderJpa(session)) {
// Group realms by expiration times. This will be effective if different realms have same/similar event expiration times, which will probably be the case in most environments // Group realms by expiration times. This will be effective if different realms have same/similar event expiration times, which will probably be the case in most environments
List<Long> eventExpirations = em.createQuery("select distinct realm.eventsExpiration from RealmEntity realm where realm.eventsExpiration > 0").getResultList(); List<Long> eventExpirations = em.createQuery("select distinct realm.eventsExpiration from RealmEntity realm where realm.eventsExpiration > 0").getResultList();
for (Long expiration : eventExpirations) { for (Long expiration : eventExpirations) {
List<String> realmIds = em.createQuery("select realm.id from RealmEntity realm where realm.eventsExpiration = :expiration") List<String> realmIds = em.createQuery("select realm.id from RealmEntity realm where realm.eventsExpiration = :expiration")
.setParameter("expiration", expiration) .setParameter("expiration", expiration)
.getResultList(); .getResultList();
int currentNumDeleted = em.createQuery("delete from EventEntity where realmId in :realmIds and time < :eventTime") int currentNumDeleted = em.createQuery("delete from EventEntity where realmId in :realmIds and time < :eventTime")
.setParameter("realmIds", realmIds) .setParameter("realmIds", realmIds)
.setParameter("eventTime", currentTimeMillis - (expiration * 1000)) .setParameter("eventTime", currentTimeMillis - (expiration * 1000))
.executeUpdate(); .executeUpdate();
logger.tracef("Deleted %d events for the expiration %d", currentNumDeleted, expiration); logger.tracef("Deleted %d events for the expiration %d", currentNumDeleted, expiration);
numDeleted += currentNumDeleted; numDeleted += currentNumDeleted;
}
logger.debugf("Cleared %d expired events in all realms", numDeleted);
} else {
session.realms().getRealmsStream().forEach(realm -> {
if (realm.isEventsEnabled() && realm.getEventsExpiration() > 0) {
long olderThan = Time.currentTimeMillis() - realm.getEventsExpiration() * 1000;
clear(realm, olderThan);
}
});
} }
logger.debugf("Cleared %d expired events in all realms", numDeleted);
} }
@Override @Override

8
server-spi-private/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java
View file

@ -978,14 +978,6 @@ public final class KeycloakModelUtils {
} }
} }
/**
* @return true if implementation of realmProvider is "jpa" . Which is always the case in standard Keycloak installations.
*/
public static boolean isRealmProviderJpa(KeycloakSession session) {
Set<String> providerIds = session.listProviderIds(RealmProvider.class);
return providerIds != null && providerIds.size() == 1 && providerIds.iterator().next().equals("jpa");
}
/** /**
* @param clientAuthenticatorType * @param clientAuthenticatorType
* @return secret size based on authentication type * @return secret size based on authentication type