From 80f4bd382225d35b6177ce2c9b7ab7fa84e0d1fd Mon Sep 17 00:00:00 2001 From: Andrei Arlou Date: Mon, 18 Nov 2019 22:48:34 +0300 Subject: [PATCH] KEYCLOAK-12089 Remove unused imports from module "model/infinispan" (#6496) --- .../org/keycloak/models/cache/infinispan/UserCacheSession.java | 3 --- .../models/cache/infinispan/entities/CachedUserConsent.java | 2 -- .../infinispan/InfinispanCodeToTokenStoreProvider.java | 1 - .../infinispan/InfinispanStickySessionEncoderProvider.java | 2 -- .../InfinispanStickySessionEncoderProviderFactory.java | 2 -- .../sessions/infinispan/RootAuthenticationSessionAdapter.java | 2 -- .../sessions/PersisterLastSessionRefreshStoreFactory.java | 3 --- .../models/sessions/infinispan/initializer/SessionLoader.java | 1 - .../infinispan/remotestore/RemoteCacheSessionsLoader.java | 1 - .../keycloak/models/sessions/infinispan/stream/Mappers.java | 3 --- .../models/sessions/infinispan/util/InfinispanUtil.java | 2 -- 11 files changed, 22 deletions(-) diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserCacheSession.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserCacheSession.java index 6432dd42be..17d69fb871 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserCacheSession.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserCacheSession.java @@ -20,10 +20,8 @@ package org.keycloak.models.cache.infinispan; import org.jboss.logging.Logger; import org.keycloak.cluster.ClusterProvider; import org.keycloak.models.ClientScopeModel; -import org.keycloak.models.cache.CachedObject; import org.keycloak.models.cache.infinispan.events.InvalidationEvent; import org.keycloak.common.constants.ServiceAccountConstants; -import org.keycloak.common.util.Time; import org.keycloak.component.ComponentModel; import org.keycloak.models.ClientModel; import org.keycloak.models.FederatedIdentityModel; @@ -58,7 +56,6 @@ import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.storage.client.ClientStorageProvider; -import java.util.Calendar; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsent.java index 7be27e7abd..fa418cb8ad 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsent.java @@ -18,8 +18,6 @@ package org.keycloak.models.cache.infinispan.entities; import org.keycloak.models.ClientScopeModel; -import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.models.RoleModel; import org.keycloak.models.UserConsentModel; import java.util.HashSet; diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanCodeToTokenStoreProvider.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanCodeToTokenStoreProvider.java index 68d94d00c5..d4530f8af6 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanCodeToTokenStoreProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanCodeToTokenStoreProvider.java @@ -25,7 +25,6 @@ import java.util.function.Supplier; import org.infinispan.client.hotrod.exceptions.HotRodClientException; import org.infinispan.commons.api.BasicCache; import org.jboss.logging.Logger; -import org.keycloak.common.util.Retry; import org.keycloak.models.CodeToTokenStoreProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.sessions.infinispan.entities.ActionTokenValueEntity; diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanStickySessionEncoderProvider.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanStickySessionEncoderProvider.java index f9086289d5..ef3b783527 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanStickySessionEncoderProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanStickySessionEncoderProvider.java @@ -18,8 +18,6 @@ package org.keycloak.models.sessions.infinispan; import org.infinispan.Cache; -import org.infinispan.distribution.DistributionManager; -import org.infinispan.remoting.transport.Address; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.sessions.infinispan.util.InfinispanUtil; diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanStickySessionEncoderProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanStickySessionEncoderProviderFactory.java index 5e87395e7b..70a1d5dc2c 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanStickySessionEncoderProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanStickySessionEncoderProviderFactory.java @@ -19,10 +19,8 @@ package org.keycloak.models.sessions.infinispan; import org.jboss.logging.Logger; import org.keycloak.Config; -import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.sessions.infinispan.util.InfinispanUtil; import org.keycloak.sessions.StickySessionEncoderProvider; import org.keycloak.sessions.StickySessionEncoderProviderFactory; diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/RootAuthenticationSessionAdapter.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/RootAuthenticationSessionAdapter.java index 9f314688ad..7eaf6cfac6 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/RootAuthenticationSessionAdapter.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/RootAuthenticationSessionAdapter.java @@ -21,14 +21,12 @@ import java.util.HashMap; import java.util.Map; import org.infinispan.Cache; -import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.Time; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.sessions.infinispan.entities.AuthenticationSessionEntity; import org.keycloak.models.sessions.infinispan.entities.RootAuthenticationSessionEntity; -import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/sessions/PersisterLastSessionRefreshStoreFactory.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/sessions/PersisterLastSessionRefreshStoreFactory.java index 54dc9f21aa..454d59e48f 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/sessions/PersisterLastSessionRefreshStoreFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/sessions/PersisterLastSessionRefreshStoreFactory.java @@ -17,10 +17,7 @@ package org.keycloak.models.sessions.infinispan.changes.sessions; -import org.infinispan.Cache; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.sessions.infinispan.changes.SessionEntityWrapper; -import org.keycloak.models.sessions.infinispan.entities.UserSessionEntity; /** * @author Marek Posolda diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/initializer/SessionLoader.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/initializer/SessionLoader.java index 6f2a566b42..b814d2ea96 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/initializer/SessionLoader.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/initializer/SessionLoader.java @@ -18,7 +18,6 @@ package org.keycloak.models.sessions.infinispan.initializer; import java.io.Serializable; -import java.util.List; import org.keycloak.models.KeycloakSession; diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remotestore/RemoteCacheSessionsLoader.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remotestore/RemoteCacheSessionsLoader.java index 7cf1e56617..7766a18685 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remotestore/RemoteCacheSessionsLoader.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remotestore/RemoteCacheSessionsLoader.java @@ -20,7 +20,6 @@ package org.keycloak.models.sessions.infinispan.remotestore; import java.io.Serializable; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Set; diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/Mappers.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/Mappers.java index 29193dde74..69fcddb569 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/Mappers.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/Mappers.java @@ -26,13 +26,10 @@ import org.keycloak.models.sessions.infinispan.entities.UserSessionEntity; import java.io.Serializable; import java.util.Collection; -import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.UUID; import java.util.function.Function; -import java.util.stream.Collector; -import java.util.stream.Collectors; import java.util.stream.Stream; /** diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/util/InfinispanUtil.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/util/InfinispanUtil.java index 33e4eb8c9e..fb2ebe6934 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/util/InfinispanUtil.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/util/InfinispanUtil.java @@ -21,8 +21,6 @@ import java.util.Set; import org.infinispan.Cache; import org.infinispan.client.hotrod.RemoteCache; -import org.infinispan.configuration.cache.CacheMode; -import org.infinispan.distribution.DistributionManager; import org.infinispan.persistence.manager.PersistenceManager; import org.infinispan.persistence.remote.RemoteStore; import org.infinispan.remoting.transport.Transport;