Skip to content

Commit

Permalink
Remove unused code from model/infinispan module
Browse files Browse the repository at this point in the history
Closes #29137

Signed-off-by: Pedro Ruivo <pruivo@redhat.com>
  • Loading branch information
pruivo committed May 6, 2024
1 parent 2ebad81 commit cf214a0
Show file tree
Hide file tree
Showing 56 changed files with 114 additions and 1,037 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.persistence.manager.PersistenceManager;
import org.infinispan.persistence.remote.RemoteStore;
import org.infinispan.remoting.transport.Transport;
import org.infinispan.remoting.transport.jgroups.JGroupsTransport;
import org.infinispan.util.EmbeddedTimeService;
import org.jboss.logging.Logger;
Expand Down Expand Up @@ -79,16 +78,6 @@ public static TopologyInfo getTopologyInfo(KeycloakSession session) {
}


/**
*
* @param cache
* @return true if cluster coordinator OR if it's local cache
*/
public static boolean isCoordinator(Cache cache) {
Transport transport = cache.getCacheManager().getTransport();
return transport == null || transport.isCoordinator();
}

/**
* Convert the given value to the proper value, which can be used when calling operations for the infinispan remoteCache.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public Object invalidateObject(String id) {

protected void bumpVersion(String id) {
long next = counter.next();
Object rev = revisions.put(id, next);
revisions.put(id, next);
}

public void addRevisioned(Revisioned object, long startupRevision) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public void groupNameInvalidations(String groupId, Set<String> invalidations) {
addInvalidations(InGroupPredicate.create().group(groupId), invalidations);
}

public void clientAdded(String realmId, String clientUUID, String clientId, Set<String> invalidations) {
public void clientAdded(String realmId, Set<String> invalidations) {
invalidations.add(RealmCacheSession.getRealmClientsQueryCacheKey(realmId));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ public class RealmCacheSession implements CacheRealmProvider {
protected Set<String> invalidations = new HashSet<>();
protected Set<InvalidationEvent> invalidationEvents = new HashSet<>(); // Events to be sent across cluster

protected boolean clearAll;
protected final long startupRevision;
private final StoreManagers datastoreProvider;

Expand All @@ -135,14 +134,6 @@ public RealmCacheSession(RealmCacheManager cache, KeycloakSession session) {
session.getTransactionManager().enlistAfterCompletion(getAfterTransaction());
}

public long getStartupRevision() {
return startupRevision;
}

public boolean isInvalid(String id) {
return invalidations.contains(id);
}

@Override
public void clear() {
ClusterProvider cluster = session.getProvider(ClusterProvider.class);
Expand Down Expand Up @@ -355,9 +346,6 @@ public void begin() {
@Override
public void commit() {
try {
if (clearAll) {
cache.clear();
}
runInvalidations();
transactionActive = false;
} finally {
Expand Down Expand Up @@ -551,7 +539,7 @@ private ClientModel addedClient(RealmModel realm, ClientModel client) {
listInvalidations.add(realm.getId());

invalidationEvents.add(ClientAddedEvent.create(client.getId(), client.getClientId(), realm.getId()));
cache.clientAdded(realm.getId(), client.getId(), client.getClientId(), invalidations);
cache.clientAdded(realm.getId(), invalidations);
return client;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void setEmail(String email) {
@Override
public UserModel getDelegateForUpdate() {
if (updated == null) {
userProviderCache.registerUserInvalidation(realm, cached);
userProviderCache.registerUserInvalidation(cached);
updated = modelSupplier.get();
if (updated == null) throw new IllegalStateException("Not found in database");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ public class UserCacheManager extends CacheManager {

private static final Logger logger = Logger.getLogger(UserCacheManager.class);

protected volatile boolean enabled = true;

public UserCacheManager(Cache<String, Revisioned> cache, Cache<String, Long> revisions) {
super(cache, revisions);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public UserProvider getDelegate() {
return delegate;
}

public void registerUserInvalidation(RealmModel realm,CachedUser user) {
public void registerUserInvalidation(CachedUser user) {
cache.userUpdatedInvalidations(user.getId(), user.getUsername(), user.getEmail(), user.getRealm(), invalidations);
invalidationEvents.add(UserUpdatedEvent.create(user.getId(), user.getUsername(), user.getEmail(), user.getRealm()));
}
Expand Down Expand Up @@ -326,7 +326,7 @@ protected UserModel validateCache(RealmModel realm, CachedUser cached) {
// although we do set a timeout, Infinispan has no guarantees when the user will be evicted
// its also hard to test stuff
if (model.shouldInvalidate(cached)) {
registerUserInvalidation(realm, cached);
registerUserInvalidation(cached);
return getDelegate().getUserById(realm, cached.getId());
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ public class StoreFactoryCacheSession implements CachedStoreFactoryProvider {
protected Set<String> invalidations = new HashSet<>();
protected Set<InvalidationEvent> invalidationEvents = new HashSet<>(); // Events to be sent across cluster

protected boolean clearAll;
protected final long startupRevision;
protected StoreFactory delegate;
protected KeycloakSession session;
Expand Down Expand Up @@ -250,16 +249,6 @@ protected void runInvalidations() {
cache.sendInvalidationEvents(session, invalidationEvents, InfinispanCacheStoreFactoryProviderFactory.AUTHORIZATION_INVALIDATION_EVENTS);
}



public long getStartupRevision() {
return startupRevision;
}

public boolean isInvalid(String id) {
return invalidations.contains(id);
}

public void registerResourceServerInvalidation(String id) {
cache.resourceServerUpdated(id, invalidations);
ResourceServerAdapter adapter = managedResourceServers.get(id);
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,18 @@

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

import org.keycloak.models.ClientModel;
import org.keycloak.models.ClientScopeModel;
import org.keycloak.models.ProtocolMapperModel;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;

import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.stream.Collectors;

import org.keycloak.models.ClientModel;
import org.keycloak.models.ProtocolMapperModel;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;

/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
Expand Down Expand Up @@ -69,8 +66,6 @@ public class CachedClient extends AbstractRevisioned implements InRealm {
protected boolean serviceAccountsEnabled;
protected int nodeReRegistrationTimeout;
protected Map<String, Integer> registeredNodes;
protected List<String> defaultClientScopesIds;
protected List<String> optionalClientScopesIds;

public CachedClient(Long revision, RealmModel realm, ClientModel model) {
super(revision, model.getId());
Expand Down Expand Up @@ -107,15 +102,6 @@ public CachedClient(Long revision, RealmModel realm, ClientModel model) {

nodeReRegistrationTimeout = model.getNodeReRegistrationTimeout();
registeredNodes = new TreeMap<>(model.getRegisteredNodes());

defaultClientScopesIds = new LinkedList<>();
for (ClientScopeModel clientScope : model.getClientScopes(true).values()) {
defaultClientScopesIds.add(clientScope.getId());
}
optionalClientScopesIds = new LinkedList<>();
for (ClientScopeModel clientScope : model.getClientScopes(false).values()) {
optionalClientScopesIds.add(clientScope.getId());
}
}

public String getClientId() {
Expand Down Expand Up @@ -242,14 +228,6 @@ public Map<String, Integer> getRegisteredNodes() {
return registeredNodes;
}

public List<String> getDefaultClientScopesIds() {
return defaultClientScopesIds;
}

public List<String> getOptionalClientScopesIds() {
return optionalClientScopesIds;
}

public Map<String, String> getAuthFlowBindings() {
return authFlowBindings;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@

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

import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;

import org.keycloak.common.enums.SslRequired;
import org.keycloak.common.util.MultivaluedHashMap;
import org.keycloak.component.ComponentModel;
Expand All @@ -40,17 +50,6 @@
import org.keycloak.models.cache.infinispan.DefaultLazyLoader;
import org.keycloak.models.cache.infinispan.LazyLoader;

import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;

/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
Expand Down Expand Up @@ -151,7 +150,6 @@ public class CachedRealm extends AbstractExtendableRevisioned {
protected Set<String> eventsListeners;
protected Set<String> enabledEventTypes;
protected boolean adminEventsEnabled;
protected Set<String> adminEnabledEventOperations = new HashSet<>();
protected boolean adminEventsDetailsEnabled;
protected String defaultRoleId;
private boolean allowUserManagedAccess;
Expand Down Expand Up @@ -597,10 +595,6 @@ public boolean isAdminEventsEnabled() {
return adminEventsEnabled;
}

public Set<String> getAdminEnabledEventOperations() {
return adminEnabledEventOperations;
}

public boolean isAdminEventsDetailsEnabled() {
return adminEventsDetailsEnabled;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
public class GroupListQuery extends AbstractRevisioned implements GroupQuery {
private final String realm;
private final String realmName;
private Map<String, Set<String>> searchKeys;
private final Map<String, Set<String>> searchKeys;

public GroupListQuery(Long revisioned, String id, RealmModel realm, String searchKey, Set<String> result) {
super(revisioned, id);
Expand Down Expand Up @@ -62,13 +62,6 @@ public String getRealm() {
return realm;
}

public Map<String, Set<String>> getSearchKeys() {
if (searchKeys == null) {
searchKeys = new HashMap<>();
}
return searchKeys;
}

@Override
public String toString() {
return "GroupListQuery{" +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public String toString() {

@Override
public void addInvalidations(RealmCacheManager realmCache, Set<String> invalidations) {
realmCache.clientAdded(realmId, clientUuid, clientId, invalidations);
realmCache.clientAdded(realmId, invalidations);
}

@Override
Expand Down

This file was deleted.

0 comments on commit cf214a0

Please sign in to comment.