Skip to content

Fix compilation error #30416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pedroigor merged 1 commit into from
Jun 13, 2024
Merged

Fix compilation error #30416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions model/infinispan/src/main/java/org/keycloak/marshalling/KeycloakModelSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import org.keycloak.models.cache.infinispan.events.GroupMovedEvent;
import org.keycloak.models.cache.infinispan.events.GroupRemovedEvent;
import org.keycloak.models.cache.infinispan.events.GroupUpdatedEvent;
import org.keycloak.models.cache.infinispan.events.CacheKeyInvalidatedEvent;
import org.keycloak.models.cache.infinispan.events.RealmRemovedEvent;
import org.keycloak.models.cache.infinispan.events.RealmUpdatedEvent;
import org.keycloak.models.cache.infinispan.events.RoleAddedEvent;
Expand Down Expand Up @@ -158,6 +159,7 @@

// models.cache.infinispan.events package
AuthenticationSessionAuthNoteUpdateEvent.class,
CacheKeyInvalidatedEvent.class,
ClientAddedEvent.class,
ClientUpdatedEvent.class,
ClientRemovedEvent.class,
Expand Down
3 changes: 3 additions & 0 deletions model/infinispan/src/main/java/org/keycloak/marshalling/Marshalling.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ private Marshalling() {
public static final int SINGLE_USE_OBJECT_VALUE_ENTITY = 65601;
public static final int USER_SESSION_ENTITY = 65602;


public static final int CACHE_KEY_INVALIDATION_EVENT = 65603;

public static void configure(GlobalConfigurationBuilder builder) {
builder.serialization()
.addContextInitializer(KeycloakModelSchema.INSTANCE);
Expand Down
4 changes: 4 additions & 0 deletions model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCacheManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ public void clientRemoval(String realmId, String clientUUID, String clientId, Se
addInvalidations(InClientPredicate.create().client(clientUUID), invalidations);
}

public void invalidateCacheKey(String key, Set<String> invalidations) {
invalidations.add(key);
}

@Override
protected void addInvalidationsFromEvent(InvalidationEvent event, Set<String> invalidations) {
invalidations.add(event.getId());
Expand Down
11 changes: 4 additions & 7 deletions model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCacheSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.keycloak.models.cache.infinispan;

import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
Expand Down Expand Up @@ -73,6 +74,7 @@
import org.keycloak.models.cache.infinispan.events.GroupRemovedEvent;
import org.keycloak.models.cache.infinispan.events.GroupUpdatedEvent;
import org.keycloak.models.cache.infinispan.events.InvalidationEvent;
import org.keycloak.models.cache.infinispan.events.CacheKeyInvalidatedEvent;
import org.keycloak.models.cache.infinispan.events.RealmRemovedEvent;
import org.keycloak.models.cache.infinispan.events.RealmUpdatedEvent;
import org.keycloak.models.cache.infinispan.events.RoleAddedEvent;
Expand Down Expand Up @@ -232,13 +234,8 @@ public long getStartupRevision() {

@Override
public void registerInvalidation(String id) {
invalidations.add(id);
invalidationEvents.add(new InvalidationEvent() {
@Override
public String getId() {
return id;
}
});
cache.invalidateCacheKey(id, invalidations);
invalidationEvents.add(new CacheKeyInvalidatedEvent(id));
}

@Override
Expand Down
39 changes: 39 additions & 0 deletions ...n/src/main/java/org/keycloak/models/cache/infinispan/events/CacheKeyInvalidatedEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
* Copyright 2024 Red Hat, Inc. and/or its affiliates
* and other contributors as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.keycloak.models.cache.infinispan.events;

import java.util.Set;

import org.infinispan.protostream.annotations.ProtoFactory;
import org.infinispan.protostream.annotations.ProtoTypeId;
import org.keycloak.marshalling.Marshalling;
import org.keycloak.models.cache.infinispan.RealmCacheManager;

@ProtoTypeId(Marshalling.CACHE_KEY_INVALIDATION_EVENT)
public class CacheKeyInvalidatedEvent extends InvalidationEvent implements RealmCacheInvalidationEvent {

@ProtoFactory
public CacheKeyInvalidatedEvent(String id) {
super(id);
}

@Override
public void addInvalidations(RealmCacheManager realmCache, Set<String> invalidations) {
realmCache.invalidateCacheKey(getId(), invalidations);
}
}
4 changes: 3 additions & 1 deletion ...ava/org/keycloak/models/cache/infinispan/organization/InfinispanOrganizationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@

public class InfinispanOrganizationProvider implements OrganizationProvider {

private static final String ORG_COUNT_KEY_SUFFIX = ".org.count";

private final KeycloakSession session;
private final OrganizationProvider orgDelegate;
private final RealmCacheSession realmCache;
Expand All @@ -42,7 +44,7 @@ public InfinispanOrganizationProvider(KeycloakSession session) {
}

static String cacheKeyOrgCount(RealmModel realm) {
return realm.getId() + ".org.count";
return realm.getId() + ORG_COUNT_KEY_SUFFIX;
}

@Override
Expand Down