From b93d55cb63ffcebe660ff4ed5826a4040bbfa0a9 Mon Sep 17 00:00:00 2001 From: Bill Burke Date: Fri, 15 Jan 2016 18:44:17 -0500 Subject: [PATCH] remove model-api, add server-spi --- broker/core/pom.xml | 2 +- .../AbstractIdentityProviderFactory.java | 2 -- .../provider/BrokeredIdentityContext.java | 1 - .../provider/HardcodedAttributeMapper.java | 2 -- .../broker/provider/IdentityProvider.java | 1 - .../provider/IdentityProviderFactory.java | 2 -- .../KeycloakOIDCIdentityProviderFactory.java | 5 ---- .../oidc/OIDCIdentityProviderFactory.java | 5 ---- .../oidc/mappers/AbstractClaimMapper.java | 1 - .../ExternalKeycloakRoleToRoleMapper.java | 1 - .../oidc/mappers/UserAttributeMapper.java | 1 - .../saml/SAMLIdentityProviderFactory.java | 4 --- .../saml/mappers/AttributeToRoleMapper.java | 3 -- connections/http-client/pom.xml | 2 +- .../httpclient/HttpClientFactory.java | 2 -- .../httpclient/HttpClientProvider.java | 1 - connections/infinispan/pom.xml | 2 +- connections/jpa-liquibase/pom.xml | 2 +- .../LiquibaseJpaUpdaterProvider.java | 15 ---------- .../liquibase/custom/AddRealmCodeSecret.java | 1 - .../custom/JpaUpdate1_2_0_Beta1.java | 1 - .../custom/JpaUpdate1_4_0_Final.java | 2 -- connections/jpa/pom.xml | 2 +- connections/mongo-update/pom.xml | 2 +- .../mongo/updater/impl/updates/Update.java | 1 - .../updater/impl/updates/Update1_4_0.java | 1 - connections/mongo/pom.xml | 2 +- connections/truststore/pom.xml | 2 +- dependencies/server-min/pom.xml | 2 +- .../keycloak-account-api/main/module.xml | 2 +- .../main/module.xml | 2 +- .../keycloak-broker-core/main/module.xml | 2 +- .../keycloak-broker-oidc/main/module.xml | 2 +- .../keycloak-broker-saml/main/module.xml | 2 +- .../main/module.xml | 2 +- .../main/module.xml | 2 +- .../main/module.xml | 2 +- .../keycloak-connections-jpa/main/module.xml | 2 +- .../main/module.xml | 2 +- .../main/module.xml | 2 +- .../main/module.xml | 2 +- .../keycloak-email-api/main/module.xml | 2 +- .../keycloak-email-freemarker/main/module.xml | 2 +- .../keycloak-events-api/main/module.xml | 2 +- .../keycloak-events-email/main/module.xml | 2 +- .../main/module.xml | 2 +- .../keycloak-events-jpa/main/module.xml | 2 +- .../keycloak-events-mongo/main/module.xml | 2 +- .../main/module.xml | 2 +- .../main/module.xml | 2 +- .../main/module.xml | 2 +- .../main/module.xml | 2 +- .../main/module.xml | 2 +- .../main/module.xml | 2 +- .../main/module.xml | 2 +- .../main/module.xml | 2 +- .../keycloak-ldap-federation/main/module.xml | 2 +- .../keycloak-login-api/main/module.xml | 2 +- .../keycloak-login-freemarker/main/module.xml | 2 +- .../keycloak-model-jpa/main/module.xml | 2 +- .../keycloak-model-mongo/main/module.xml | 2 +- .../main/module.xml | 2 +- .../keycloak-saml-protocol/main/module.xml | 2 +- .../main/module.xml | 4 +-- .../WEB-INF/jboss-deployment-structure.xml | 2 +- .../keycloak-services/main/module.xml | 2 +- .../keycloak-social-core/main/module.xml | 2 +- .../keycloak-social-facebook/main/module.xml | 2 +- .../keycloak-social-github/main/module.xml | 2 +- .../keycloak-social-google/main/module.xml | 2 +- .../keycloak-social-linkedin/main/module.xml | 2 +- .../main/module.xml | 2 +- .../keycloak-social-twitter/main/module.xml | 2 +- .../keycloak-timer-api/main/module.xml | 2 +- .../keycloak-timer-basic/main/module.xml | 2 +- .../keycloak-wildfly-adduser/main/module.xml | 2 +- .../main/module.xml | 2 +- .../reference/en/en-US/modules/providers.xml | 4 +-- events/api/pom.xml | 2 +- events/email/pom.xml | 2 +- events/jboss-logging/pom.xml | 2 +- ...ssLoggingEventListenerProviderFactory.java | 3 -- events/jpa/pom.xml | 2 +- .../jpa/JpaEventStoreProviderFactory.java | 4 --- events/mongo/pom.xml | 2 +- events/syslog/pom.xml | 2 +- examples/providers/authenticator/pom.xml | 2 +- .../SecretQuestionAuthenticator.java | 1 - .../providers/event-listener-sysout/pom.xml | 3 +- examples/providers/event-store-mem/pom.xml | 3 +- .../providers/federation-provider/pom.xml | 2 +- export-import/export-import-api/pom.xml | 2 +- export-import/export-import-dir/pom.xml | 2 +- .../export-import-single-file/pom.xml | 2 +- federation/kerberos/pom.xml | 2 +- federation/ldap/pom.xml | 2 +- .../ldap/LDAPFederationProvider.java | 4 --- .../AbstractLDAPFederationMapperFactory.java | 4 --- .../FullNameLDAPFederationMapperFactory.java | 2 -- ...rAttributeLDAPFederationMapperFactory.java | 3 -- .../membership/role/RoleMapperConfig.java | 1 - forms/account-api/pom.xml | 2 +- forms/account-freemarker/pom.xml | 2 +- .../account/freemarker/model/RealmBean.java | 2 -- forms/common-freemarker/pom.xml | 2 +- forms/common-themes/pom.xml | 2 +- .../theme/JarThemeProviderFactory.java | 2 -- forms/email-api/pom.xml | 2 +- forms/email-freemarker/pom.xml | 2 +- .../email/freemarker/beans/ProfileBean.java | 1 - forms/login-api/pom.xml | 2 +- .../keycloak/login/LoginFormsProvider.java | 5 ---- forms/login-freemarker/pom.xml | 2 +- .../freemarker/model/OAuthGrantBean.java | 1 - .../login/freemarker/model/RealmBean.java | 2 -- .../RequiredActionUrlFormatterMethod.java | 3 -- model/invalidation-cache/infinispan/pom.xml | 2 +- .../infinispan/ClientTemplateAdapter.java | 2 -- .../infinispan/DefaultCacheUserProvider.java | 2 -- .../models/cache/infinispan/GroupAdapter.java | 4 --- .../InfinispanCacheUserProviderFactory.java | 4 --- .../invalidation-cache/model-adapters/pom.xml | 3 +- .../cache/entities/CachedClientTemplate.java | 4 --- .../models/cache/entities/CachedGroup.java | 4 --- model/jpa/pom.xml | 2 +- .../models/jpa/ClientTemplateAdapter.java | 6 ---- .../org/keycloak/models/jpa/GroupAdapter.java | 23 -------------- .../org/keycloak/models/jpa/UserAdapter.java | 1 - .../models/jpa/entities/GroupEntity.java | 3 -- .../entities/UserRequiredActionEntity.java | 2 -- model/mongo/pom.xml | 2 +- .../keycloak/adapters/ClientAdapter.java | 1 - .../adapters/ClientTemplateAdapter.java | 7 ----- .../mongo/keycloak/adapters/GroupAdapter.java | 6 ---- .../adapters/MigrationModelAdapter.java | 19 ------------ .../mongo/keycloak/adapters/UserAdapter.java | 1 - .../entities/MongoClientTemplateEntity.java | 3 -- .../models/mongo/utils/MongoModelUtils.java | 2 -- model/pom.xml | 1 - model/sessions-infinispan/pom.xml | 3 +- .../InfinispanUserSessionProvider.java | 1 - .../infinispan/UserSessionAdapter.java | 1 - .../entities/ClientSessionEntity.java | 2 -- .../InfinispanUserSessionInitializer.java | 1 - pom.xml | 5 ++-- saml/saml-protocol/pom.xml | 2 +- .../keycloak/protocol/saml/SamlClient.java | 1 - .../protocol/saml/SamlClientTemplate.java | 1 - .../keycloak/protocol/saml/SamlProtocol.java | 1 - ...yDescriptorClientRegistrationProvider.java | 1 - .../KeycloakSamlClientInstallation.java | 1 - .../saml/mappers/GroupMembershipMapper.java | 6 ---- .../protocol/saml/mappers/RoleNameMapper.java | 2 -- .../UserSessionNoteStatementMapper.java | 2 -- .../authenticator/HttpBasicAuthenticator.java | 3 -- {model/api => server-spi}/pom.xml | 6 ++-- .../keycloak/hash/PasswordHashManager.java | 0 .../keycloak/hash/PasswordHashProvider.java | 0 .../hash/PasswordHashProviderFactory.java | 0 .../org/keycloak/hash/PasswordHashSpi.java | 0 .../hash/Pbkdf2PasswordHashProvider.java | 0 .../MapperConfigValidationException.java | 0 .../mappers/UserFederationMapper.java | 0 .../mappers/UserFederationMapperFactory.java | 0 .../mappers/UserFederationMapperSpi.java | 0 .../keycloak/migration/MigrationModel.java | 0 .../migration/MigrationModelManager.java | 0 .../keycloak/migration/MigrationProvider.java | 0 .../migration/MigrationProviderFactory.java | 0 .../org/keycloak/migration/MigrationSpi.java | 0 .../org/keycloak/migration/ModelVersion.java | 0 .../migration/migrators/MigrateTo1_3_0.java | 2 -- .../migration/migrators/MigrateTo1_4_0.java | 0 .../migration/migrators/MigrateTo1_5_0.java | 5 ---- .../migration/migrators/MigrateTo1_6_0.java | 0 .../migration/migrators/MigrateTo1_7_0.java | 0 .../migration/migrators/MigrateTo1_8_0.java | 0 .../migrators/MigrationTo1_2_0_CR1.java | 0 .../org/keycloak/models/AccountRoles.java | 0 .../java/org/keycloak/models/AdminRoles.java | 0 .../models/AuthenticationExecutionModel.java | 0 .../models/AuthenticationFlowModel.java | 0 .../models/AuthenticatorConfigModel.java | 0 .../models/BrowserSecurityHeaders.java | 0 .../java/org/keycloak/models/ClaimMask.java | 0 .../org/keycloak/models/ClaimTypeModel.java | 0 .../keycloak/models/ClientConfigResolver.java | 0 .../models/ClientInitialAccessModel.java | 0 .../java/org/keycloak/models/ClientModel.java | 0 .../keycloak/models/ClientSessionModel.java | 0 .../keycloak/models/ClientTemplateModel.java | 2 -- .../java/org/keycloak/models/Constants.java | 0 .../models/CredentialValidationOutput.java | 0 .../models/FederatedIdentityModel.java | 0 .../java/org/keycloak/models/GroupModel.java | 0 .../models/IdentityProviderMapperModel.java | 0 .../models/IdentityProviderModel.java | 2 -- .../models/ImpersonationConstants.java | 0 .../org/keycloak/models/KeycloakContext.java | 0 .../org/keycloak/models/KeycloakSession.java | 1 - .../models/KeycloakSessionFactory.java | 0 .../keycloak/models/KeycloakSessionTask.java | 0 .../keycloak/models/KeycloakTransaction.java | 0 .../models/KeycloakTransactionManager.java | 0 .../org/keycloak/models/LDAPConstants.java | 0 .../models/ModelDuplicateException.java | 0 .../org/keycloak/models/ModelException.java | 0 .../models/ModelReadOnlyException.java | 0 .../java/org/keycloak/models/OTPPolicy.java | 0 .../org/keycloak/models/PasswordPolicy.java | 1 - .../models/ProtocolMapperContainerModel.java | 0 .../keycloak/models/ProtocolMapperModel.java | 0 .../java/org/keycloak/models/RealmModel.java | 0 .../org/keycloak/models/RealmProvider.java | 0 .../keycloak/models/RealmProviderFactory.java | 0 .../java/org/keycloak/models/RealmSpi.java | 0 .../models/RequiredActionProviderModel.java | 0 .../models/RequiredCredentialModel.java | 0 .../keycloak/models/RoleContainerModel.java | 0 .../org/keycloak/models/RoleMapperModel.java | 0 .../java/org/keycloak/models/RoleModel.java | 0 .../keycloak/models/ScopeContainerModel.java | 0 .../org/keycloak/models/UserConsentModel.java | 0 .../keycloak/models/UserCredentialModel.java | 0 .../models/UserCredentialValueModel.java | 0 ...erFederationEventAwareProviderFactory.java | 0 .../models/UserFederationManager.java | 1 - .../models/UserFederationMapperModel.java | 0 .../models/UserFederationProvider.java | 0 ...erFederationProviderCreationEventImpl.java | 0 .../models/UserFederationProviderFactory.java | 0 .../models/UserFederationProviderModel.java | 0 .../keycloak/models/UserFederationSpi.java | 0 .../models/UserFederationSyncResult.java | 0 .../java/org/keycloak/models/UserModel.java | 0 .../org/keycloak/models/UserProvider.java | 1 - .../keycloak/models/UserProviderFactory.java | 0 .../org/keycloak/models/UserSessionModel.java | 0 .../keycloak/models/UserSessionProvider.java | 1 - .../models/UserSessionProviderFactory.java | 0 .../org/keycloak/models/UserSessionSpi.java | 0 .../java/org/keycloak/models/UserSpi.java | 0 .../models/UsernameLoginFailureModel.java | 0 .../entities/AbstractIdentifiableEntity.java | 0 .../AuthenticationExecutionEntity.java | 0 .../entities/AuthenticationFlowEntity.java | 1 - .../entities/AuthenticatorConfigEntity.java | 0 .../models/entities/ClientEntity.java | 0 .../ClientIdentityProviderMappingEntity.java | 0 .../models/entities/ClientTemplateEntity.java | 0 .../models/entities/CredentialEntity.java | 0 .../entities/FederatedIdentityEntity.java | 0 .../keycloak/models/entities/GroupEntity.java | 2 -- .../entities/IdentityProviderEntity.java | 0 .../IdentityProviderMapperEntity.java | 0 .../PersistentClientSessionEntity.java | 0 .../entities/PersistentUserSessionEntity.java | 0 .../models/entities/ProtocolMapperEntity.java | 0 .../keycloak/models/entities/RealmEntity.java | 0 .../RequiredActionProviderEntity.java | 0 .../entities/RequiredCredentialEntity.java | 0 .../keycloak/models/entities/RoleEntity.java | 0 .../models/entities/UserConsentEntity.java | 0 .../keycloak/models/entities/UserEntity.java | 0 .../entities/UserFederationMapperEntity.java | 0 .../UserFederationProviderEntity.java | 0 .../entities/UsernameLoginFailureEntity.java | 0 .../DisabledUserSessionPersisterProvider.java | 0 .../PersistentClientSessionAdapter.java | 0 .../session/PersistentClientSessionModel.java | 0 .../session/PersistentUserSessionAdapter.java | 0 .../session/PersistentUserSessionModel.java | 0 .../session/UserSessionPersisterProvider.java | 0 .../UserSessionPersisterProviderFactory.java | 0 .../session/UserSessionPersisterSpi.java | 0 .../org/keycloak/models/utils/Base32.java | 0 .../models/utils/CredentialValidation.java | 2 -- .../utils/DefaultAuthenticationFlows.java | 0 .../models/utils/DefaultRequiredActions.java | 0 .../keycloak/models/utils/FormMessage.java | 0 .../org/keycloak/models/utils/HmacOTP.java | 0 .../models/utils/KeycloakModelUtils.java | 4 --- .../models/utils/ModelToRepresentation.java | 0 .../models/utils/PostMigrationEvent.java | 0 .../keycloak/models/utils/RealmImporter.java | 0 .../keycloak/models/utils/RealmInfoUtil.java | 0 .../models/utils/RepresentationToModel.java | 1 - .../models/utils/SHAPasswordEncoder.java | 0 .../keycloak/models/utils/TimeBasedOTP.java | 0 .../models/utils/UserModelDelegate.java | 0 .../reflection/AnnotatedPropertyCriteria.java | 0 .../utils/reflection/MethodProperty.java | 0 .../utils/reflection/MethodPropertyImpl.java | 0 .../reflection/NamedPropertyCriteria.java | 0 .../models/utils/reflection/Properties.java | 0 .../models/utils/reflection/Property.java | 0 .../utils/reflection/PropertyCriteria.java | 0 .../utils/reflection/PropertyQueries.java | 0 .../utils/reflection/PropertyQuery.java | 0 .../reflection/TypedPropertyCriteria.java | 0 .../keycloak/provider/ConfiguredProvider.java | 0 .../java/org/keycloak/provider/Provider.java | 0 .../provider/ProviderConfigProperty.java | 0 .../org/keycloak/provider/ProviderEvent.java | 0 .../provider/ProviderEventListener.java | 0 .../provider/ProviderEventManager.java | 0 .../keycloak/provider/ProviderFactory.java | 0 .../org/keycloak/provider/ProviderLoader.java | 0 .../provider/ProviderLoaderFactory.java | 0 .../ServerInfoAwareProviderFactory.java | 0 .../main/java/org/keycloak/provider/Spi.java | 0 ....keycloak.hash.PasswordHashProviderFactory | 0 ...ession.UserSessionPersisterProviderFactory | 0 .../services/org.keycloak.provider.Spi | 0 .../java/org/keycloak/models/HmacTest.java | 9 ------ .../keycloak/models/PasswordPolicyTest.java | 0 services/pom.xml | 3 +- .../authentication/AuthenticatorFactory.java | 3 -- .../authentication/AuthenticatorSpi.java | 1 - .../ClientAuthenticationFlow.java | 2 -- .../authentication/ClientAuthenticator.java | 3 -- .../DefaultAuthenticationFlow.java | 2 -- .../authentication/FormAuthenticator.java | 3 -- .../RequiredActionProvider.java | 2 -- .../SerializedBrokeredIdentityContext.java | 2 -- .../browser/UsernamePasswordForm.java | 2 -- .../authenticators/client/ClientAuthUtil.java | 6 ---- .../authenticators/resetcred/ResetOTP.java | 3 -- .../resetcred/ResetPassword.java | 10 ------- .../forms/RegistrationRecaptcha.java | 1 - .../requiredactions/TermsAndConditions.java | 2 -- .../requiredactions/UpdateProfile.java | 4 --- .../requiredactions/UpdateTotp.java | 6 ---- .../KeycloakClientDescriptionConverter.java | 3 -- .../partialimport/ClientsPartialImport.java | 2 -- .../keycloak/protocol/oidc/TokenManager.java | 1 - .../endpoints/LoginStatusIframeEndpoint.java | 1 - .../protocol/oidc/mappers/FullNameMapper.java | 1 - .../oidc/mappers/GroupMembershipMapper.java | 3 -- .../protocol/oidc/mappers/HardcodedClaim.java | 3 -- .../protocol/oidc/mappers/HardcodedRole.java | 1 - .../oidc/mappers/OIDCIDTokenMapper.java | 1 - .../protocol/oidc/mappers/RoleNameMapper.java | 3 -- .../oidc/mappers/UserAttributeMapper.java | 1 - .../services/DefaultKeycloakSession.java | 4 --- .../AbstractClientRegistrationProvider.java | 1 - .../ClientRegistrationTokenUtils.java | 1 - .../DefaultClientRegistrationProvider.java | 4 --- .../oidc/OIDCClientRegistrationProvider.java | 1 - .../managers/AuthenticationManager.java | 1 - .../services/managers/ClientManager.java | 1 - .../migration/DefaultMigrationProvider.java | 1 - .../AbstractSecuredLocalService.java | 2 -- .../services/resources/RealmsResource.java | 1 - .../services/resources/ThemeResource.java | 2 -- .../services/resources/admin/AdminRoot.java | 2 -- .../admin/ClientRoleMappingsResource.java | 1 - .../admin/ClientTemplateResource.java | 30 ------------------- .../admin/ClientTemplatesResource.java | 2 -- .../resources/admin/ClientsResource.java | 1 - .../resources/admin/GroupResource.java | 3 -- .../resources/admin/GroupsResource.java | 9 ------ .../admin/ProtocolMappersResource.java | 1 - .../resources/admin/RealmAdminResource.java | 1 - .../keycloak/services/util/LocaleHelper.java | 3 -- .../org/keycloak/testsuite/AssertEvents.java | 1 - .../testsuite/account/AccountTest.java | 1 - .../actions/TermsAndConditionsTest.java | 1 - .../testsuite/adapter/MultiTenancyTest.java | 1 - .../adapter/RelativeUriAdapterTest.java | 13 -------- .../testsuite/admin/AbstractClientTest.java | 3 -- .../keycloak/testsuite/admin/ClientTest.java | 2 -- .../testsuite/admin/ImpersonationTest.java | 1 - .../keycloak/testsuite/admin/UserTest.java | 10 ------- .../broker/AbstractFirstBrokerLoginTest.java | 4 --- .../broker/AbstractIdentityProviderTest.java | 18 ----------- .../AbstractKeycloakIdentityProviderTest.java | 2 -- .../testsuite/broker/BrokerKeyCloakRule.java | 1 - .../broker/ImportIdentityProviderTest.java | 1 - .../SAMLKeyCloakServerBrokerBasicTest.java | 1 - ...KeyCloakServerBrokerWithSignatureTest.java | 1 - .../ldap/base/LDAPGroupMapperSyncTest.java | 1 - .../forms/CustomRegistrationFlowTest.java | 5 ---- .../testsuite/forms/LoginHotpTest.java | 1 - .../forms/PassThroughClientAuthenticator.java | 3 -- .../model/UserFederationModelTest.java | 1 - .../testsuite/oauth/AccessTokenTest.java | 1 - .../oauth/AuthorizationCodeTest.java | 1 - .../oauth/TokenIntrospectionTest.java | 3 -- .../keycloak/testsuite/rule/KeycloakRule.java | 2 -- .../org/keycloak/testsuite/JettySamlTest.java | 1 - testsuite/performance/pom.xml | 3 +- .../performance/CreateRealmsWorker.java | 1 - .../org/keycloak/testsuite/TomcatTest.java | 1 - .../org/keycloak/testsuite/Tomcat7Test.java | 2 -- .../keycloak/testsuite/TomcatSamlTest.java | 1 - .../org/keycloak/testsuite/TomcatTest.java | 1 - timer/api/pom.xml | 2 +- timer/basic/pom.xml | 2 +- wildfly/adduser/pom.xml | 2 +- wildfly/extensions/pom.xml | 2 +- .../wildfly/ModuleProviderLoaderFactory.java | 1 - 402 files changed, 107 insertions(+), 574 deletions(-) mode change 100644 => 100755 connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java mode change 100644 => 100755 connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AddRealmCodeSecret.java mode change 100644 => 100755 connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_Beta1.java mode change 100644 => 100755 connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_4_0_Final.java mode change 100644 => 100755 connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update.java mode change 100644 => 100755 connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update1_4_0.java rename distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/{keycloak-model-api => keycloak-server-spi}/main/module.xml (84%) mode change 100644 => 100755 federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/AbstractLDAPFederationMapperFactory.java mode change 100644 => 100755 federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/FullNameLDAPFederationMapperFactory.java mode change 100644 => 100755 federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/UserAttributeLDAPFederationMapperFactory.java mode change 100644 => 100755 federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/membership/role/RoleMapperConfig.java mode change 100644 => 100755 forms/common-themes/src/main/java/org/keycloak/theme/JarThemeProviderFactory.java mode change 100644 => 100755 model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/initializer/InfinispanUserSessionInitializer.java mode change 100644 => 100755 saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/clientregistration/EntityDescriptorClientRegistrationProvider.java mode change 100644 => 100755 saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticator.java rename {model/api => server-spi}/pom.xml (93%) rename {model/api => server-spi}/src/main/java/org/keycloak/hash/PasswordHashManager.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/hash/PasswordHashProvider.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/hash/PasswordHashProviderFactory.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/hash/PasswordHashSpi.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/hash/Pbkdf2PasswordHashProvider.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/mappers/MapperConfigValidationException.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/mappers/UserFederationMapper.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/mappers/UserFederationMapperFactory.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/mappers/UserFederationMapperSpi.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/migration/MigrationModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/migration/MigrationModelManager.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/migration/MigrationProvider.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/migration/MigrationProviderFactory.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/migration/MigrationSpi.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/migration/ModelVersion.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/migration/migrators/MigrateTo1_3_0.java (96%) rename {model/api => server-spi}/src/main/java/org/keycloak/migration/migrators/MigrateTo1_4_0.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/migration/migrators/MigrateTo1_5_0.java (90%) rename {model/api => server-spi}/src/main/java/org/keycloak/migration/migrators/MigrateTo1_6_0.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/migration/migrators/MigrateTo1_7_0.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/migration/migrators/MigrateTo1_8_0.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/migration/migrators/MigrationTo1_2_0_CR1.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/AccountRoles.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/AdminRoles.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/AuthenticationExecutionModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/AuthenticationFlowModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/AuthenticatorConfigModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/BrowserSecurityHeaders.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/ClaimMask.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/ClaimTypeModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/ClientConfigResolver.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/ClientInitialAccessModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/ClientModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/ClientSessionModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/ClientTemplateModel.java (96%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/Constants.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/CredentialValidationOutput.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/FederatedIdentityModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/GroupModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/IdentityProviderMapperModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/IdentityProviderModel.java (98%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/ImpersonationConstants.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/KeycloakContext.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/KeycloakSession.java (97%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/KeycloakSessionFactory.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/KeycloakSessionTask.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/KeycloakTransaction.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/KeycloakTransactionManager.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/LDAPConstants.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/ModelDuplicateException.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/ModelException.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/ModelReadOnlyException.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/OTPPolicy.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/PasswordPolicy.java (99%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/ProtocolMapperContainerModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/ProtocolMapperModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/RealmModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/RealmProvider.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/RealmProviderFactory.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/RealmSpi.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/RequiredActionProviderModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/RequiredCredentialModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/RoleContainerModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/RoleMapperModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/RoleModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/ScopeContainerModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserConsentModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserCredentialModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserCredentialValueModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserFederationEventAwareProviderFactory.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserFederationManager.java (99%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserFederationMapperModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserFederationProvider.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserFederationProviderCreationEventImpl.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserFederationProviderFactory.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserFederationProviderModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserFederationSpi.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserFederationSyncResult.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserProvider.java (99%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserProviderFactory.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserSessionModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserSessionProvider.java (99%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserSessionProviderFactory.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserSessionSpi.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UserSpi.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/UsernameLoginFailureModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/AbstractIdentifiableEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/AuthenticationExecutionEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/AuthenticationFlowEntity.java (98%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/AuthenticatorConfigEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/ClientEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/ClientIdentityProviderMappingEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/ClientTemplateEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/CredentialEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/FederatedIdentityEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/GroupEntity.java (95%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/IdentityProviderEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/IdentityProviderMapperEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/PersistentClientSessionEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/PersistentUserSessionEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/ProtocolMapperEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/RealmEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/RequiredActionProviderEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/RequiredCredentialEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/RoleEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/UserConsentEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/UserEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/UserFederationMapperEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/UserFederationProviderEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/entities/UsernameLoginFailureEntity.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/session/DisabledUserSessionPersisterProvider.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/session/PersistentClientSessionAdapter.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/session/PersistentClientSessionModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/session/PersistentUserSessionModel.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/session/UserSessionPersisterProvider.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/session/UserSessionPersisterProviderFactory.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/session/UserSessionPersisterSpi.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/Base32.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/CredentialValidation.java (98%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/DefaultAuthenticationFlows.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/DefaultRequiredActions.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/FormMessage.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/HmacOTP.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java (99%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/PostMigrationEvent.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/RealmImporter.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/RealmInfoUtil.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/RepresentationToModel.java (99%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/SHAPasswordEncoder.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/TimeBasedOTP.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/UserModelDelegate.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/reflection/AnnotatedPropertyCriteria.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/reflection/MethodProperty.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/reflection/MethodPropertyImpl.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/reflection/NamedPropertyCriteria.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/reflection/Properties.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/reflection/Property.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/reflection/PropertyCriteria.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/reflection/PropertyQueries.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/reflection/PropertyQuery.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/models/utils/reflection/TypedPropertyCriteria.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/provider/ConfiguredProvider.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/provider/Provider.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/provider/ProviderConfigProperty.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/provider/ProviderEvent.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/provider/ProviderEventListener.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/provider/ProviderEventManager.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/provider/ProviderFactory.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/provider/ProviderLoader.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/provider/ProviderLoaderFactory.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/provider/ServerInfoAwareProviderFactory.java (100%) rename {model/api => server-spi}/src/main/java/org/keycloak/provider/Spi.java (100%) rename {model/api => server-spi}/src/main/resources/META-INF/services/org.keycloak.hash.PasswordHashProviderFactory (100%) rename {model/api => server-spi}/src/main/resources/META-INF/services/org.keycloak.models.session.UserSessionPersisterProviderFactory (100%) rename {model/api => server-spi}/src/main/resources/META-INF/services/org.keycloak.provider.Spi (100%) rename {model/api => server-spi}/src/test/java/org/keycloak/models/HmacTest.java (72%) rename {model/api => server-spi}/src/test/java/org/keycloak/models/PasswordPolicyTest.java (100%) mode change 100644 => 100755 services/src/main/java/org/keycloak/authentication/ClientAuthenticationFlow.java mode change 100644 => 100755 services/src/main/java/org/keycloak/authentication/ClientAuthenticator.java mode change 100644 => 100755 services/src/main/java/org/keycloak/authentication/authenticators/broker/util/SerializedBrokeredIdentityContext.java mode change 100644 => 100755 services/src/main/java/org/keycloak/authentication/authenticators/client/ClientAuthUtil.java mode change 100644 => 100755 services/src/main/java/org/keycloak/exportimport/KeycloakClientDescriptionConverter.java mode change 100644 => 100755 services/src/main/java/org/keycloak/partialimport/ClientsPartialImport.java mode change 100644 => 100755 services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java mode change 100644 => 100755 services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationTokenUtils.java mode change 100644 => 100755 services/src/main/java/org/keycloak/services/clientregistration/DefaultClientRegistrationProvider.java mode change 100644 => 100755 services/src/main/java/org/keycloak/services/clientregistration/oidc/OIDCClientRegistrationProvider.java mode change 100644 => 100755 services/src/main/java/org/keycloak/services/util/LocaleHelper.java mode change 100644 => 100755 testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java mode change 100644 => 100755 testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractKeycloakIdentityProviderTest.java mode change 100644 => 100755 testsuite/integration/src/test/java/org/keycloak/testsuite/broker/BrokerKeyCloakRule.java mode change 100644 => 100755 testsuite/integration/src/test/java/org/keycloak/testsuite/federation/ldap/base/LDAPGroupMapperSyncTest.java mode change 100644 => 100755 testsuite/integration/src/test/java/org/keycloak/testsuite/forms/PassThroughClientAuthenticator.java mode change 100644 => 100755 testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserFederationModelTest.java mode change 100644 => 100755 wildfly/extensions/src/main/java/org/keycloak/provider/wildfly/ModuleProviderLoaderFactory.java diff --git a/broker/core/pom.xml b/broker/core/pom.xml index 51bfca0b38..fb673895c0 100755 --- a/broker/core/pom.xml +++ b/broker/core/pom.xml @@ -21,7 +21,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi org.keycloak diff --git a/broker/core/src/main/java/org/keycloak/broker/provider/AbstractIdentityProviderFactory.java b/broker/core/src/main/java/org/keycloak/broker/provider/AbstractIdentityProviderFactory.java index 898cee440f..28286eeb66 100755 --- a/broker/core/src/main/java/org/keycloak/broker/provider/AbstractIdentityProviderFactory.java +++ b/broker/core/src/main/java/org/keycloak/broker/provider/AbstractIdentityProviderFactory.java @@ -18,10 +18,8 @@ package org.keycloak.broker.provider; import org.keycloak.Config; -import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.RealmModel; import java.io.InputStream; import java.util.HashMap; diff --git a/broker/core/src/main/java/org/keycloak/broker/provider/BrokeredIdentityContext.java b/broker/core/src/main/java/org/keycloak/broker/provider/BrokeredIdentityContext.java index 95417fd80e..8bbfdb9b18 100755 --- a/broker/core/src/main/java/org/keycloak/broker/provider/BrokeredIdentityContext.java +++ b/broker/core/src/main/java/org/keycloak/broker/provider/BrokeredIdentityContext.java @@ -22,7 +22,6 @@ import org.keycloak.models.Constants; import org.keycloak.models.IdentityProviderModel; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/broker/core/src/main/java/org/keycloak/broker/provider/HardcodedAttributeMapper.java b/broker/core/src/main/java/org/keycloak/broker/provider/HardcodedAttributeMapper.java index 7ab99447a2..30c651c78a 100755 --- a/broker/core/src/main/java/org/keycloak/broker/provider/HardcodedAttributeMapper.java +++ b/broker/core/src/main/java/org/keycloak/broker/provider/HardcodedAttributeMapper.java @@ -1,10 +1,8 @@ package org.keycloak.broker.provider; -import org.keycloak.models.ClientModel; import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; -import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.provider.ProviderConfigProperty; diff --git a/broker/core/src/main/java/org/keycloak/broker/provider/IdentityProvider.java b/broker/core/src/main/java/org/keycloak/broker/provider/IdentityProvider.java index 42eb6fedf4..1f6fd2026b 100755 --- a/broker/core/src/main/java/org/keycloak/broker/provider/IdentityProvider.java +++ b/broker/core/src/main/java/org/keycloak/broker/provider/IdentityProvider.java @@ -20,7 +20,6 @@ package org.keycloak.broker.provider; import org.keycloak.events.EventBuilder; import org.keycloak.models.ClientSessionModel; import org.keycloak.models.FederatedIdentityModel; -import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; diff --git a/broker/core/src/main/java/org/keycloak/broker/provider/IdentityProviderFactory.java b/broker/core/src/main/java/org/keycloak/broker/provider/IdentityProviderFactory.java index db2570d397..1f1bdccf05 100755 --- a/broker/core/src/main/java/org/keycloak/broker/provider/IdentityProviderFactory.java +++ b/broker/core/src/main/java/org/keycloak/broker/provider/IdentityProviderFactory.java @@ -18,8 +18,6 @@ package org.keycloak.broker.provider; import org.keycloak.models.IdentityProviderModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; import org.keycloak.provider.ProviderFactory; import java.io.InputStream; diff --git a/broker/oidc/src/main/java/org/keycloak/broker/oidc/KeycloakOIDCIdentityProviderFactory.java b/broker/oidc/src/main/java/org/keycloak/broker/oidc/KeycloakOIDCIdentityProviderFactory.java index 8d9f44a137..e7f81e9b4a 100755 --- a/broker/oidc/src/main/java/org/keycloak/broker/oidc/KeycloakOIDCIdentityProviderFactory.java +++ b/broker/oidc/src/main/java/org/keycloak/broker/oidc/KeycloakOIDCIdentityProviderFactory.java @@ -17,15 +17,10 @@ */ package org.keycloak.broker.oidc; -import org.keycloak.broker.oidc.mappers.UsernameTemplateMapper; import org.keycloak.broker.provider.AbstractIdentityProviderFactory; -import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; import java.io.InputStream; -import java.util.HashMap; import java.util.Map; /** diff --git a/broker/oidc/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProviderFactory.java b/broker/oidc/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProviderFactory.java index c959aec1a5..4d0cb34c7b 100755 --- a/broker/oidc/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProviderFactory.java +++ b/broker/oidc/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProviderFactory.java @@ -17,15 +17,11 @@ */ package org.keycloak.broker.oidc; -import org.keycloak.broker.oidc.mappers.UsernameTemplateMapper; import org.keycloak.broker.provider.util.SimpleHttp; import org.keycloak.broker.provider.AbstractIdentityProviderFactory; import org.keycloak.jose.jwk.JWK; import org.keycloak.jose.jwk.JWKParser; -import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.protocol.oidc.representations.JSONWebKeySet; import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentation; @@ -34,7 +30,6 @@ import org.keycloak.util.JsonSerialization; import java.io.IOException; import java.io.InputStream; import java.security.PublicKey; -import java.util.HashMap; import java.util.Map; /** diff --git a/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimMapper.java b/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimMapper.java index 8547a03040..e8fc7da918 100755 --- a/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimMapper.java +++ b/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimMapper.java @@ -4,7 +4,6 @@ import org.keycloak.broker.oidc.KeycloakOIDCIdentityProvider; import org.keycloak.broker.provider.AbstractIdentityProviderMapper; import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.models.IdentityProviderMapperModel; -import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.JsonWebToken; import java.util.List; diff --git a/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/ExternalKeycloakRoleToRoleMapper.java b/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/ExternalKeycloakRoleToRoleMapper.java index f7ddb76f2c..52393656f6 100755 --- a/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/ExternalKeycloakRoleToRoleMapper.java +++ b/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/ExternalKeycloakRoleToRoleMapper.java @@ -2,7 +2,6 @@ package org.keycloak.broker.oidc.mappers; import org.keycloak.broker.oidc.KeycloakOIDCIdentityProvider; import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory; -import org.keycloak.broker.oidc.OIDCIdentityProviderFactory; import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.broker.provider.HardcodedRoleMapper; import org.keycloak.broker.provider.IdentityBrokerException; diff --git a/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/UserAttributeMapper.java b/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/UserAttributeMapper.java index 659938826f..eacb486f2b 100755 --- a/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/UserAttributeMapper.java +++ b/broker/oidc/src/main/java/org/keycloak/broker/oidc/mappers/UserAttributeMapper.java @@ -10,7 +10,6 @@ import org.keycloak.models.UserModel; import org.keycloak.provider.ProviderConfigProperty; import java.util.ArrayList; -import java.util.Collection; import java.util.List; /** diff --git a/broker/saml/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderFactory.java b/broker/saml/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderFactory.java index 4adeddfd29..5545bd744b 100755 --- a/broker/saml/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderFactory.java +++ b/broker/saml/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderFactory.java @@ -18,17 +18,13 @@ package org.keycloak.broker.saml; import org.keycloak.broker.provider.AbstractIdentityProviderFactory; -import org.keycloak.broker.saml.mappers.UsernameTemplateMapper; import org.keycloak.dom.saml.v2.metadata.EndpointType; import org.keycloak.dom.saml.v2.metadata.EntitiesDescriptorType; import org.keycloak.dom.saml.v2.metadata.EntityDescriptorType; import org.keycloak.dom.saml.v2.metadata.IDPSSODescriptorType; import org.keycloak.dom.saml.v2.metadata.KeyDescriptorType; import org.keycloak.dom.saml.v2.metadata.KeyTypes; -import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.DocumentUtil; diff --git a/broker/saml/src/main/java/org/keycloak/broker/saml/mappers/AttributeToRoleMapper.java b/broker/saml/src/main/java/org/keycloak/broker/saml/mappers/AttributeToRoleMapper.java index 48d2ac89d7..3e1894beca 100755 --- a/broker/saml/src/main/java/org/keycloak/broker/saml/mappers/AttributeToRoleMapper.java +++ b/broker/saml/src/main/java/org/keycloak/broker/saml/mappers/AttributeToRoleMapper.java @@ -9,7 +9,6 @@ import org.keycloak.broker.saml.SAMLIdentityProviderFactory; import org.keycloak.dom.saml.v2.assertion.AssertionType; import org.keycloak.dom.saml.v2.assertion.AttributeStatementType; import org.keycloak.dom.saml.v2.assertion.AttributeType; -import org.keycloak.models.ClientModel; import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -17,11 +16,9 @@ import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.provider.ProviderConfigProperty; -import org.keycloak.representations.JsonWebToken; import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * @author Bill Burke diff --git a/connections/http-client/pom.xml b/connections/http-client/pom.xml index 99eceff3fc..7bb0f1d7f3 100755 --- a/connections/http-client/pom.xml +++ b/connections/http-client/pom.xml @@ -20,7 +20,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi org.keycloak diff --git a/connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientFactory.java b/connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientFactory.java index 2172b4e9cf..912a3bf233 100755 --- a/connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientFactory.java +++ b/connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientFactory.java @@ -1,7 +1,5 @@ package org.keycloak.connections.httpclient; -import org.apache.http.client.HttpClient; -import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderFactory; /** diff --git a/connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientProvider.java b/connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientProvider.java index d897dd2f04..bf29d9ae71 100755 --- a/connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientProvider.java +++ b/connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientProvider.java @@ -2,7 +2,6 @@ package org.keycloak.connections.httpclient; import org.apache.http.client.HttpClient; import org.keycloak.provider.Provider; -import org.keycloak.provider.ProviderFactory; import java.io.IOException; import java.io.InputStream; diff --git a/connections/infinispan/pom.xml b/connections/infinispan/pom.xml index 56420f1a7c..2b5b727c03 100755 --- a/connections/infinispan/pom.xml +++ b/connections/infinispan/pom.xml @@ -20,7 +20,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi org.infinispan diff --git a/connections/jpa-liquibase/pom.xml b/connections/jpa-liquibase/pom.xml index d1503b9bb3..7c97307921 100755 --- a/connections/jpa-liquibase/pom.xml +++ b/connections/jpa-liquibase/pom.xml @@ -20,7 +20,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi org.liquibase diff --git a/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java b/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java old mode 100644 new mode 100755 index e4565c8f9d..464e51f365 --- a/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java +++ b/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java @@ -7,21 +7,7 @@ import liquibase.changelog.DatabaseChangeLog; import liquibase.changelog.RanChangeSet; import liquibase.database.Database; import liquibase.database.DatabaseFactory; -import liquibase.database.core.DB2Database; -import liquibase.database.core.DerbyDatabase; -import liquibase.database.core.FirebirdDatabase; -import liquibase.database.core.H2Database; -import liquibase.database.core.HsqlDatabase; -import liquibase.database.core.InformixDatabase; -import liquibase.database.core.MSSQLDatabase; -import liquibase.database.core.MySQLDatabase; -import liquibase.database.core.OracleDatabase; -import liquibase.database.core.PostgresDatabase; -import liquibase.database.core.SQLiteDatabase; -import liquibase.database.core.SybaseASADatabase; -import liquibase.database.core.SybaseDatabase; import liquibase.database.jvm.JdbcConnection; -import liquibase.exception.LiquibaseException; import liquibase.logging.LogFactory; import liquibase.logging.LogLevel; import liquibase.resource.ClassLoaderResourceAccessor; @@ -31,7 +17,6 @@ import org.keycloak.connections.jpa.updater.JpaUpdaterProvider; import org.keycloak.models.KeycloakSession; import java.sql.Connection; -import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; import java.util.List; diff --git a/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AddRealmCodeSecret.java b/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AddRealmCodeSecret.java old mode 100644 new mode 100755 index 3190485b1e..092ab69edf --- a/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AddRealmCodeSecret.java +++ b/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AddRealmCodeSecret.java @@ -10,7 +10,6 @@ import liquibase.resource.ResourceAccessor; import liquibase.snapshot.SnapshotGeneratorFactory; import liquibase.statement.SqlStatement; import liquibase.statement.core.UpdateStatement; -import liquibase.structure.core.Schema; import liquibase.structure.core.Table; import org.keycloak.connections.jpa.updater.liquibase.LiquibaseJpaUpdaterProvider; import org.keycloak.models.utils.KeycloakModelUtils; diff --git a/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_Beta1.java b/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_Beta1.java old mode 100644 new mode 100755 index 70c62372f6..786060a542 --- a/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_Beta1.java +++ b/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_Beta1.java @@ -11,7 +11,6 @@ import liquibase.statement.core.InsertStatement; import liquibase.statement.core.UpdateStatement; import liquibase.structure.core.Table; import org.keycloak.Config; -import org.keycloak.connections.jpa.updater.liquibase.LiquibaseJpaUpdaterProvider; import org.keycloak.migration.MigrationProvider; import org.keycloak.models.AdminRoles; import org.keycloak.models.ClaimMask; diff --git a/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_4_0_Final.java b/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_4_0_Final.java old mode 100644 new mode 100755 index 579b108cdf..a6c55ee332 --- a/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_4_0_Final.java +++ b/connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_4_0_Final.java @@ -3,9 +3,7 @@ package org.keycloak.connections.jpa.updater.liquibase.custom; import java.sql.PreparedStatement; import java.sql.ResultSet; -import liquibase.datatype.DataTypeFactory; import liquibase.exception.CustomChangeException; -import liquibase.statement.core.InsertStatement; import liquibase.statement.core.UpdateStatement; import liquibase.structure.core.Table; import org.keycloak.models.utils.KeycloakModelUtils; diff --git a/connections/jpa/pom.xml b/connections/jpa/pom.xml index 2933e6b0de..a804699911 100755 --- a/connections/jpa/pom.xml +++ b/connections/jpa/pom.xml @@ -20,7 +20,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi org.hibernate.javax.persistence diff --git a/connections/mongo-update/pom.xml b/connections/mongo-update/pom.xml index 8063dcab70..d3c2cf56c3 100755 --- a/connections/mongo-update/pom.xml +++ b/connections/mongo-update/pom.xml @@ -20,7 +20,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi org.keycloak diff --git a/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update.java b/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update.java old mode 100644 new mode 100755 index 8e32a73af1..ec7abb0b7e --- a/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update.java +++ b/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update.java @@ -5,7 +5,6 @@ import com.mongodb.DB; import com.mongodb.DBCollection; import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.utils.KeycloakModelUtils; import java.util.Arrays; diff --git a/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update1_4_0.java b/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update1_4_0.java old mode 100644 new mode 100755 index b58d5a3ab6..b72688d5fe --- a/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update1_4_0.java +++ b/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update1_4_0.java @@ -8,7 +8,6 @@ import com.mongodb.BasicDBObject; import com.mongodb.DBCollection; import com.mongodb.DBCursor; import org.keycloak.models.KeycloakSession; -import org.keycloak.representations.idm.IdentityProviderRepresentation; /** * @author Marek Posolda diff --git a/connections/mongo/pom.xml b/connections/mongo/pom.xml index c889b5b628..f05c9489d3 100755 --- a/connections/mongo/pom.xml +++ b/connections/mongo/pom.xml @@ -20,7 +20,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi org.mongodb diff --git a/connections/truststore/pom.xml b/connections/truststore/pom.xml index 868f5f0f55..c0d42583a9 100755 --- a/connections/truststore/pom.xml +++ b/connections/truststore/pom.xml @@ -24,7 +24,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi org.jboss.logging diff --git a/dependencies/server-min/pom.xml b/dependencies/server-min/pom.xml index 1357706694..a5791fb3a7 100755 --- a/dependencies/server-min/pom.xml +++ b/dependencies/server-min/pom.xml @@ -41,7 +41,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi org.keycloak diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-api/main/module.xml index 32d13c0f18..c49741c350 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-api/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-api/main/module.xml @@ -8,7 +8,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-freemarker/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-freemarker/main/module.xml index 528f98279b..cc21098a90 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-freemarker/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-freemarker/main/module.xml @@ -10,7 +10,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-core/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-core/main/module.xml index e7e18c26ba..dec5a0fc07 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-core/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-core/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-oidc/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-oidc/main/module.xml index dcc57d0f5f..c8d84aeaf6 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-oidc/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-oidc/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-saml/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-saml/main/module.xml index c982863e0d..9179bc99a1 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-saml/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-saml/main/module.xml @@ -8,7 +8,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-http-client/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-http-client/main/module.xml index 5611eca9bf..3188114d2b 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-http-client/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-http-client/main/module.xml @@ -12,7 +12,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-infinispan/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-infinispan/main/module.xml index cbaabbd8f3..2e9c217375 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-infinispan/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-infinispan/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml index 9b5f9e8048..ec6a855e01 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa-liquibase/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa/main/module.xml index e1474fb7ed..3d4996438f 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-jpa/main/module.xml @@ -12,7 +12,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo-update/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo-update/main/module.xml index 74b1e82b60..e14309ebdc 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo-update/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo-update/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo/main/module.xml index c989e2e7b8..8a10dd62fe 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-truststore/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-truststore/main/module.xml index 8599425107..23047c8779 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-truststore/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-truststore/main/module.xml @@ -8,7 +8,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-api/main/module.xml index 7d0c883690..08ba50aef6 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-api/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-api/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-freemarker/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-freemarker/main/module.xml index ffb5b96186..7a3fada3d6 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-freemarker/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-freemarker/main/module.xml @@ -10,7 +10,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-api/main/module.xml index ef28fe20db..0d1796a605 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-api/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-api/main/module.xml @@ -7,7 +7,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-email/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-email/main/module.xml index 4d13741e01..8ea965accc 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-email/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-email/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jboss-logging/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jboss-logging/main/module.xml index adec7b0b08..cb9aa7cc40 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jboss-logging/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jboss-logging/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jpa/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jpa/main/module.xml index 4bf30f418d..641d1f84da 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jpa/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jpa/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-mongo/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-mongo/main/module.xml index 11061179ce..340f5cf375 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-mongo/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-mongo/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-api/main/module.xml index f45530e441..c4729cad43 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-api/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-api/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-dir/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-dir/main/module.xml index 4124c4aabc..9b834bef6d 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-dir/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-dir/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-single-file/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-single-file/main/module.xml index 7ac4128b81..41b089c3a4 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-single-file/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-single-file/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-freemarker/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-freemarker/main/module.xml index 843ff870c4..8e152354dd 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-freemarker/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-freemarker/main/module.xml @@ -8,7 +8,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-themes/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-themes/main/module.xml index 9dc3cd06ac..7900d0c2fa 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-themes/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-forms-common-themes/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml index 2b999c412c..bfb4193afc 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-infinispan/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-model/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-model/main/module.xml index 8961652bcd..03b9de5321 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-model/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-model/main/module.xml @@ -7,7 +7,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-kerberos-federation/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-kerberos-federation/main/module.xml index eedb59783e..2448a383ac 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-kerberos-federation/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-kerberos-federation/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-ldap-federation/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-ldap-federation/main/module.xml index 2619043193..7b7a99d1b3 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-ldap-federation/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-ldap-federation/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-api/main/module.xml index 6eff134697..d0bb1b08d4 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-api/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-api/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-freemarker/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-freemarker/main/module.xml index 155a65dcba..c33da4a3a8 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-freemarker/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-freemarker/main/module.xml @@ -11,7 +11,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-jpa/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-jpa/main/module.xml index fa77d5ef11..dbca1cafd7 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-jpa/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-jpa/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-mongo/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-mongo/main/module.xml index 63b46c9ffc..499808f570 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-mongo/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-mongo/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml index db50bebc84..4957055577 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-sessions-infinispan/main/module.xml @@ -9,7 +9,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-protocol/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-protocol/main/module.xml index 81cd365853..674f2a2708 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-protocol/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-protocol/main/module.xml @@ -10,7 +10,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-spi/main/module.xml similarity index 84% rename from distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-api/main/module.xml rename to distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-spi/main/module.xml index e3946bcc9b..ce78f0f4fc 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-api/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-spi/main/module.xml @@ -2,9 +2,9 @@ - + - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml index 0ca01dc23f..b4eaa3c27d 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml @@ -30,7 +30,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml index 45a8fdb7f8..61082b2b3b 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml @@ -40,7 +40,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-core/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-core/main/module.xml index c73064310a..9ac6be0901 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-core/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-core/main/module.xml @@ -7,7 +7,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-facebook/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-facebook/main/module.xml index 2dbf77179f..4060a8ce33 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-facebook/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-facebook/main/module.xml @@ -12,7 +12,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-github/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-github/main/module.xml index a2d0bd820c..6506f3cbe7 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-github/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-github/main/module.xml @@ -12,7 +12,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-google/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-google/main/module.xml index 1fa21df2b8..5bfe0704ea 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-google/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-google/main/module.xml @@ -12,7 +12,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-linkedin/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-linkedin/main/module.xml index 17c0cb81cd..29f523ef4f 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-linkedin/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-linkedin/main/module.xml @@ -12,7 +12,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-stackoverflow/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-stackoverflow/main/module.xml index ad974ca97d..b5b87c99c7 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-stackoverflow/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-stackoverflow/main/module.xml @@ -12,7 +12,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-twitter/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-twitter/main/module.xml index 85e62f6218..ee647211a8 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-twitter/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-social-twitter/main/module.xml @@ -12,7 +12,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-api/main/module.xml index c527a0b9c3..00b0c1e458 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-api/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-api/main/module.xml @@ -7,7 +7,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-basic/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-basic/main/module.xml index 8e3470e293..832808eab0 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-basic/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-basic/main/module.xml @@ -8,7 +8,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-adduser/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-adduser/main/module.xml index 64e8369bb9..2e7433598c 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-adduser/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-adduser/main/module.xml @@ -7,7 +7,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-extensions/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-extensions/main/module.xml index 2315359e10..e536b6c21e 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-extensions/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-extensions/main/module.xml @@ -6,7 +6,7 @@ - + diff --git a/docbook/auth-server-docs/reference/en/en-US/modules/providers.xml b/docbook/auth-server-docs/reference/en/en-US/modules/providers.xml index 71c2919441..da16e55d9e 100755 --- a/docbook/auth-server-docs/reference/en/en-US/modules/providers.xml +++ b/docbook/auth-server-docs/reference/en/en-US/modules/providers.xml @@ -147,7 +147,7 @@ public class MyEventListenerProviderFactory implements EventListenerProviderFact script or manually create a folder inside KEYCLOAK_HOME/modules and add your jar and a module.xml. For example to add the event listener sysout example provider using the jboss-cli script execute: Or to manually create it start by creating the folder KEYCLOAK_HOME/modules/org/keycloak/examples/event-sysout/main. Then copy event-listener-sysout-example.jar to this folder and create module.xml @@ -160,7 +160,7 @@ public class MyEventListenerProviderFactory implements EventListenerProviderFact - + diff --git a/events/api/pom.xml b/events/api/pom.xml index 2ff0514d69..91731f7f38 100755 --- a/events/api/pom.xml +++ b/events/api/pom.xml @@ -25,7 +25,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/events/email/pom.xml b/events/email/pom.xml index d8379f1e10..270c70e227 100755 --- a/events/email/pom.xml +++ b/events/email/pom.xml @@ -20,7 +20,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/events/jboss-logging/pom.xml b/events/jboss-logging/pom.xml index 7e39010118..4cc66d09b6 100755 --- a/events/jboss-logging/pom.xml +++ b/events/jboss-logging/pom.xml @@ -25,7 +25,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/events/jboss-logging/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProviderFactory.java b/events/jboss-logging/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProviderFactory.java index 07ae4e2b9c..47924845f6 100755 --- a/events/jboss-logging/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProviderFactory.java +++ b/events/jboss-logging/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProviderFactory.java @@ -6,9 +6,6 @@ import org.keycloak.events.EventListenerProvider; import org.keycloak.events.EventListenerProviderFactory; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import sun.rmi.runtime.Log; - -import java.util.logging.Level; /** * @author Stian Thorgersen diff --git a/events/jpa/pom.xml b/events/jpa/pom.xml index a552cd329a..33c593ce6c 100755 --- a/events/jpa/pom.xml +++ b/events/jpa/pom.xml @@ -20,7 +20,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/events/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProviderFactory.java b/events/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProviderFactory.java index 0d95457b0f..0102aa4742 100755 --- a/events/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProviderFactory.java +++ b/events/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProviderFactory.java @@ -4,13 +4,9 @@ import org.keycloak.Config; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.events.EventStoreProvider; import org.keycloak.events.EventStoreProviderFactory; -import org.keycloak.events.EventType; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import java.util.HashSet; -import java.util.Set; - /** * @author Stian Thorgersen */ diff --git a/events/mongo/pom.xml b/events/mongo/pom.xml index 9e0cc09f9a..6ff83fb6e1 100755 --- a/events/mongo/pom.xml +++ b/events/mongo/pom.xml @@ -20,7 +20,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/events/syslog/pom.xml b/events/syslog/pom.xml index c7efdc49fe..ce1146083f 100755 --- a/events/syslog/pom.xml +++ b/events/syslog/pom.xml @@ -25,7 +25,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/examples/providers/authenticator/pom.xml b/examples/providers/authenticator/pom.xml index 22f14a449e..2886647388 100755 --- a/examples/providers/authenticator/pom.xml +++ b/examples/providers/authenticator/pom.xml @@ -21,7 +21,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/examples/providers/authenticator/src/main/java/org/keycloak/examples/authenticator/SecretQuestionAuthenticator.java b/examples/providers/authenticator/src/main/java/org/keycloak/examples/authenticator/SecretQuestionAuthenticator.java index f70c0f7dc3..8e8cb48d79 100755 --- a/examples/providers/authenticator/src/main/java/org/keycloak/examples/authenticator/SecretQuestionAuthenticator.java +++ b/examples/providers/authenticator/src/main/java/org/keycloak/examples/authenticator/SecretQuestionAuthenticator.java @@ -13,7 +13,6 @@ import org.keycloak.services.util.CookieHelper; import javax.ws.rs.core.Cookie; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; import java.net.URI; /** diff --git a/examples/providers/event-listener-sysout/pom.xml b/examples/providers/event-listener-sysout/pom.xml index 78398a4baf..3684a17de7 100755 --- a/examples/providers/event-listener-sysout/pom.xml +++ b/examples/providers/event-listener-sysout/pom.xml @@ -20,7 +20,8 @@ org.keycloak - keycloak-model-api + keycloak-server-spi + provided org.keycloak diff --git a/examples/providers/event-store-mem/pom.xml b/examples/providers/event-store-mem/pom.xml index 814d5655f5..739705731d 100755 --- a/examples/providers/event-store-mem/pom.xml +++ b/examples/providers/event-store-mem/pom.xml @@ -20,7 +20,8 @@ org.keycloak - keycloak-model-api + keycloak-server-spi + provided org.keycloak diff --git a/examples/providers/federation-provider/pom.xml b/examples/providers/federation-provider/pom.xml index d6885dec0b..b31ba5e082 100755 --- a/examples/providers/federation-provider/pom.xml +++ b/examples/providers/federation-provider/pom.xml @@ -21,7 +21,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/export-import/export-import-api/pom.xml b/export-import/export-import-api/pom.xml index b0e703f6fd..3b042845a4 100755 --- a/export-import/export-import-api/pom.xml +++ b/export-import/export-import-api/pom.xml @@ -21,7 +21,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/export-import/export-import-dir/pom.xml b/export-import/export-import-dir/pom.xml index 80a0f92f97..b664706a34 100755 --- a/export-import/export-import-dir/pom.xml +++ b/export-import/export-import-dir/pom.xml @@ -21,7 +21,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/export-import/export-import-single-file/pom.xml b/export-import/export-import-single-file/pom.xml index 95dc4f7017..c94271bdc4 100755 --- a/export-import/export-import-single-file/pom.xml +++ b/export-import/export-import-single-file/pom.xml @@ -21,7 +21,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/federation/kerberos/pom.xml b/federation/kerberos/pom.xml index 57e0a0c6cb..57c62b6532 100755 --- a/federation/kerberos/pom.xml +++ b/federation/kerberos/pom.xml @@ -20,7 +20,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/federation/ldap/pom.xml b/federation/ldap/pom.xml index 52f121b1b2..2aa690d758 100755 --- a/federation/ldap/pom.xml +++ b/federation/ldap/pom.xml @@ -20,7 +20,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPFederationProvider.java b/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPFederationProvider.java index f93de4633b..61786ccc69 100755 --- a/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPFederationProvider.java +++ b/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPFederationProvider.java @@ -3,7 +3,6 @@ package org.keycloak.federation.ldap; import org.jboss.logging.Logger; import org.keycloak.federation.kerberos.impl.KerberosUsernamePasswordAuthenticator; import org.keycloak.federation.kerberos.impl.SPNEGOAuthenticator; -import org.keycloak.federation.ldap.idm.model.LDAPDn; import org.keycloak.federation.ldap.idm.model.LDAPObject; import org.keycloak.federation.ldap.idm.query.Condition; import org.keycloak.federation.ldap.idm.query.internal.LDAPQuery; @@ -11,8 +10,6 @@ import org.keycloak.federation.ldap.idm.query.internal.LDAPQueryConditionsBuilde import org.keycloak.federation.ldap.idm.store.ldap.LDAPIdentityStore; import org.keycloak.federation.ldap.kerberos.LDAPProviderKerberosConfig; import org.keycloak.federation.ldap.mappers.LDAPFederationMapper; -import org.keycloak.federation.ldap.mappers.membership.group.GroupLDAPFederationMapper; -import org.keycloak.federation.ldap.mappers.membership.group.GroupLDAPFederationMapperFactory; import org.keycloak.models.CredentialValidationOutput; import org.keycloak.models.GroupModel; import org.keycloak.models.KeycloakSession; @@ -32,7 +29,6 @@ import org.keycloak.common.constants.KerberosConstants; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; diff --git a/federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/AbstractLDAPFederationMapperFactory.java b/federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/AbstractLDAPFederationMapperFactory.java old mode 100644 new mode 100755 index 5ab13f1b15..87cd153a9d --- a/federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/AbstractLDAPFederationMapperFactory.java +++ b/federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/AbstractLDAPFederationMapperFactory.java @@ -1,8 +1,5 @@ package org.keycloak.federation.ldap.mappers; -import java.util.List; -import java.util.Map; - import org.keycloak.Config; import org.keycloak.federation.ldap.LDAPFederationProvider; import org.keycloak.federation.ldap.LDAPFederationProviderFactory; @@ -13,7 +10,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; import org.keycloak.models.UserFederationMapperModel; -import org.keycloak.models.UserFederationProvider; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.idm.UserFederationMapperSyncConfigRepresentation; diff --git a/federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/FullNameLDAPFederationMapperFactory.java b/federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/FullNameLDAPFederationMapperFactory.java old mode 100644 new mode 100755 index 7fbcf06318..93fe3e0db8 --- a/federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/FullNameLDAPFederationMapperFactory.java +++ b/federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/FullNameLDAPFederationMapperFactory.java @@ -8,8 +8,6 @@ import java.util.Map; import org.keycloak.federation.ldap.LDAPConfig; import org.keycloak.federation.ldap.LDAPFederationProvider; import org.keycloak.mappers.MapperConfigValidationException; -import org.keycloak.mappers.UserFederationMapper; -import org.keycloak.models.KeycloakSession; import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; import org.keycloak.models.UserFederationMapperModel; diff --git a/federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/UserAttributeLDAPFederationMapperFactory.java b/federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/UserAttributeLDAPFederationMapperFactory.java old mode 100644 new mode 100755 index 5d929007d7..c138e31b7c --- a/federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/UserAttributeLDAPFederationMapperFactory.java +++ b/federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/UserAttributeLDAPFederationMapperFactory.java @@ -8,9 +8,6 @@ import java.util.Map; import org.keycloak.federation.ldap.LDAPConfig; import org.keycloak.federation.ldap.LDAPFederationProvider; import org.keycloak.mappers.MapperConfigValidationException; -import org.keycloak.mappers.UserFederationMapper; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; import org.keycloak.models.UserFederationMapperModel; import org.keycloak.models.UserFederationProvider; diff --git a/federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/membership/role/RoleMapperConfig.java b/federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/membership/role/RoleMapperConfig.java old mode 100644 new mode 100755 index a908197c85..c6bd9ecab2 --- a/federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/membership/role/RoleMapperConfig.java +++ b/federation/ldap/src/main/java/org/keycloak/federation/ldap/mappers/membership/role/RoleMapperConfig.java @@ -4,7 +4,6 @@ import java.util.Collection; import org.keycloak.federation.ldap.LDAPFederationProvider; import org.keycloak.federation.ldap.mappers.membership.CommonLDAPGroupMapperConfig; -import org.keycloak.federation.ldap.mappers.membership.UserRolesRetrieveStrategy; import org.keycloak.models.LDAPConstants; import org.keycloak.models.ModelException; import org.keycloak.models.UserFederationMapperModel; diff --git a/forms/account-api/pom.xml b/forms/account-api/pom.xml index 271a4d9dd4..6054a5abf3 100755 --- a/forms/account-api/pom.xml +++ b/forms/account-api/pom.xml @@ -21,7 +21,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/forms/account-freemarker/pom.xml b/forms/account-freemarker/pom.xml index b693e7dc5d..6672c769ee 100755 --- a/forms/account-freemarker/pom.xml +++ b/forms/account-freemarker/pom.xml @@ -26,7 +26,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/model/RealmBean.java b/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/model/RealmBean.java index 05a84c9618..fa04db0168 100755 --- a/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/model/RealmBean.java +++ b/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/model/RealmBean.java @@ -22,8 +22,6 @@ package org.keycloak.account.freemarker.model; import org.keycloak.models.RealmModel; -import org.keycloak.models.RequiredCredentialModel; -import org.keycloak.representations.idm.CredentialRepresentation; import java.util.Set; diff --git a/forms/common-freemarker/pom.xml b/forms/common-freemarker/pom.xml index 6a1f327a75..41b0cd63d1 100755 --- a/forms/common-freemarker/pom.xml +++ b/forms/common-freemarker/pom.xml @@ -21,7 +21,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/forms/common-themes/pom.xml b/forms/common-themes/pom.xml index f66609ca5c..7baa59094a 100755 --- a/forms/common-themes/pom.xml +++ b/forms/common-themes/pom.xml @@ -21,7 +21,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/forms/common-themes/src/main/java/org/keycloak/theme/JarThemeProviderFactory.java b/forms/common-themes/src/main/java/org/keycloak/theme/JarThemeProviderFactory.java old mode 100644 new mode 100755 index bcd0316939..8f72e29dc1 --- a/forms/common-themes/src/main/java/org/keycloak/theme/JarThemeProviderFactory.java +++ b/forms/common-themes/src/main/java/org/keycloak/theme/JarThemeProviderFactory.java @@ -13,9 +13,7 @@ import java.io.InputStream; import java.net.URL; import java.util.Enumeration; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Set; /** * @author Stian Thorgersen diff --git a/forms/email-api/pom.xml b/forms/email-api/pom.xml index 1662d47b1e..76e06603c6 100755 --- a/forms/email-api/pom.xml +++ b/forms/email-api/pom.xml @@ -21,7 +21,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/forms/email-freemarker/pom.xml b/forms/email-freemarker/pom.xml index f6d48b8759..a272cff815 100755 --- a/forms/email-freemarker/pom.xml +++ b/forms/email-freemarker/pom.xml @@ -26,7 +26,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/beans/ProfileBean.java b/forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/beans/ProfileBean.java index 812fb44291..c18607c821 100755 --- a/forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/beans/ProfileBean.java +++ b/forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/beans/ProfileBean.java @@ -24,7 +24,6 @@ package org.keycloak.email.freemarker.beans; import org.jboss.logging.Logger; import org.keycloak.models.UserModel; -import javax.ws.rs.core.MultivaluedMap; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/forms/login-api/pom.xml b/forms/login-api/pom.xml index c76353e390..ed91ed3009 100755 --- a/forms/login-api/pom.xml +++ b/forms/login-api/pom.xml @@ -21,7 +21,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/forms/login-api/src/main/java/org/keycloak/login/LoginFormsProvider.java b/forms/login-api/src/main/java/org/keycloak/login/LoginFormsProvider.java index eaeb4b4df5..ac9145d380 100755 --- a/forms/login-api/src/main/java/org/keycloak/login/LoginFormsProvider.java +++ b/forms/login-api/src/main/java/org/keycloak/login/LoginFormsProvider.java @@ -2,17 +2,12 @@ package org.keycloak.login; import java.net.URI; import java.util.List; -import java.util.Map; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; -import org.keycloak.models.ClientModel; import org.keycloak.models.ClientSessionModel; import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.models.utils.FormMessage; diff --git a/forms/login-freemarker/pom.xml b/forms/login-freemarker/pom.xml index 2fedecacad..1da6dc7ed2 100755 --- a/forms/login-freemarker/pom.xml +++ b/forms/login-freemarker/pom.xml @@ -36,7 +36,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/OAuthGrantBean.java b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/OAuthGrantBean.java index f3040843c9..ceb5b86538 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/OAuthGrantBean.java +++ b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/OAuthGrantBean.java @@ -30,7 +30,6 @@ import org.keycloak.models.RoleModel; import javax.ws.rs.core.MultivaluedMap; import java.util.LinkedList; import java.util.List; -import java.util.Map; /** * @author Viliam Rockai diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RealmBean.java b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RealmBean.java index 027a2c2b0b..38b21f9bd1 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RealmBean.java +++ b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RealmBean.java @@ -25,8 +25,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.RequiredCredentialModel; import org.keycloak.representations.idm.CredentialRepresentation; -import java.util.Set; - /** * @author Stian Thorgersen */ diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RequiredActionUrlFormatterMethod.java b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RequiredActionUrlFormatterMethod.java index 3056e26ad5..7a39a10368 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RequiredActionUrlFormatterMethod.java +++ b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/RequiredActionUrlFormatterMethod.java @@ -6,10 +6,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.services.Urls; import java.net.URI; -import java.text.MessageFormat; import java.util.List; -import java.util.Locale; -import java.util.Properties; /** */ diff --git a/model/invalidation-cache/infinispan/pom.xml b/model/invalidation-cache/infinispan/pom.xml index 717c742682..3a8730de98 100755 --- a/model/invalidation-cache/infinispan/pom.xml +++ b/model/invalidation-cache/infinispan/pom.xml @@ -16,7 +16,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi org.keycloak diff --git a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClientTemplateAdapter.java b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClientTemplateAdapter.java index d403adc170..be064cf140 100755 --- a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClientTemplateAdapter.java +++ b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClientTemplateAdapter.java @@ -8,12 +8,10 @@ import org.keycloak.models.RoleContainerModel; import org.keycloak.models.RoleModel; import org.keycloak.models.cache.CacheRealmProvider; import org.keycloak.models.cache.RealmCache; -import org.keycloak.models.cache.entities.CachedClient; import org.keycloak.models.cache.entities.CachedClientTemplate; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Set; diff --git a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/DefaultCacheUserProvider.java b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/DefaultCacheUserProvider.java index ba933b5198..12e5b5dfda 100755 --- a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/DefaultCacheUserProvider.java +++ b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/DefaultCacheUserProvider.java @@ -4,8 +4,6 @@ import org.keycloak.models.*; import org.keycloak.models.cache.CacheUserProvider; import org.keycloak.models.cache.UserCache; import org.keycloak.models.cache.entities.CachedUser; -import org.keycloak.models.session.PersistentClientSessionModel; -import org.keycloak.models.session.PersistentUserSessionModel; import java.util.*; diff --git a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/GroupAdapter.java b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/GroupAdapter.java index ec6e7436cf..9dd723985a 100755 --- a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/GroupAdapter.java +++ b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/GroupAdapter.java @@ -6,14 +6,10 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleContainerModel; import org.keycloak.models.RoleModel; -import org.keycloak.models.UserModel; import org.keycloak.models.cache.CacheRealmProvider; -import org.keycloak.models.cache.CacheUserProvider; import org.keycloak.models.cache.entities.CachedGroup; -import org.keycloak.models.cache.entities.CachedUser; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java index f99513f65a..c590a4e4ba 100755 --- a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java +++ b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java @@ -1,10 +1,6 @@ package org.keycloak.models.cache.infinispan; import org.infinispan.Cache; -import org.infinispan.commands.write.RemoveCommand; -import org.infinispan.container.entries.CacheEntry; -import org.infinispan.context.InvocationContext; -import org.infinispan.interceptors.base.CommandInterceptor; import org.infinispan.notifications.Listener; import org.infinispan.notifications.cachelistener.annotation.*; import org.infinispan.notifications.cachelistener.event.*; diff --git a/model/invalidation-cache/model-adapters/pom.xml b/model/invalidation-cache/model-adapters/pom.xml index 15cb3e6f77..41f40f6618 100755 --- a/model/invalidation-cache/model-adapters/pom.xml +++ b/model/invalidation-cache/model-adapters/pom.xml @@ -26,7 +26,8 @@ org.keycloak - keycloak-model-api + keycloak-server-spi + provided org.jboss.resteasy diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedClientTemplate.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedClientTemplate.java index b03430deee..a60a5c9565 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedClientTemplate.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedClientTemplate.java @@ -1,6 +1,5 @@ package org.keycloak.models.cache.entities; -import org.keycloak.models.ClientModel; import org.keycloak.models.ClientTemplateModel; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; @@ -11,11 +10,8 @@ import org.keycloak.models.cache.RealmCache; import java.io.Serializable; 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; /** * @author Bill Burke diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedGroup.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedGroup.java index a410c1b0f4..b6a7e4816a 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedGroup.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedGroup.java @@ -4,13 +4,9 @@ import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.GroupModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; -import org.keycloak.models.UserCredentialValueModel; -import org.keycloak.models.UserModel; import java.io.Serializable; import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; import java.util.Set; /** diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml index e759373243..fb0b31ade3 100755 --- a/model/jpa/pom.xml +++ b/model/jpa/pom.xml @@ -24,7 +24,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi org.keycloak diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/ClientTemplateAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/ClientTemplateAdapter.java index 4e70debd06..a9bc4fbc64 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/ClientTemplateAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/ClientTemplateAdapter.java @@ -1,7 +1,5 @@ package org.keycloak.models.jpa; -import org.keycloak.connections.jpa.util.JpaUtils; -import org.keycloak.models.ClientModel; import org.keycloak.models.ClientTemplateModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ModelDuplicateException; @@ -9,18 +7,14 @@ import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleContainerModel; import org.keycloak.models.RoleModel; -import org.keycloak.models.jpa.entities.ClientEntity; import org.keycloak.models.jpa.entities.ClientTemplateEntity; import org.keycloak.models.jpa.entities.ProtocolMapperEntity; import org.keycloak.models.jpa.entities.RoleEntity; -import org.keycloak.models.jpa.entities.ScopeMappingEntity; import org.keycloak.models.jpa.entities.TemplateScopeMappingEntity; import org.keycloak.models.utils.KeycloakModelUtils; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; -import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.List; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/GroupAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/GroupAdapter.java index 9f6fdbabd5..3b60e23bea 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/GroupAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/GroupAdapter.java @@ -1,42 +1,19 @@ package org.keycloak.models.jpa; import org.keycloak.common.util.MultivaluedHashMap; -import org.keycloak.common.util.Time; import org.keycloak.models.ClientModel; import org.keycloak.models.GroupModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ModelDuplicateException; -import org.keycloak.models.ModelException; -import org.keycloak.models.OTPPolicy; -import org.keycloak.models.PasswordPolicy; -import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleContainerModel; import org.keycloak.models.RoleModel; -import org.keycloak.models.UserConsentModel; -import org.keycloak.models.UserCredentialModel; -import org.keycloak.models.UserCredentialValueModel; -import org.keycloak.models.UserModel; -import org.keycloak.models.jpa.entities.CredentialEntity; import org.keycloak.models.jpa.entities.GroupAttributeEntity; import org.keycloak.models.jpa.entities.GroupEntity; import org.keycloak.models.jpa.entities.GroupRoleMappingEntity; -import org.keycloak.models.jpa.entities.RoleEntity; -import org.keycloak.models.jpa.entities.UserAttributeEntity; -import org.keycloak.models.jpa.entities.UserConsentEntity; -import org.keycloak.models.jpa.entities.UserConsentProtocolMapperEntity; -import org.keycloak.models.jpa.entities.UserConsentRoleEntity; -import org.keycloak.models.jpa.entities.UserEntity; -import org.keycloak.models.jpa.entities.UserRequiredActionEntity; -import org.keycloak.models.jpa.entities.UserRoleMappingEntity; import org.keycloak.models.utils.KeycloakModelUtils; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; import java.util.HashSet; import java.util.Iterator; import java.util.List; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/UserAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/UserAdapter.java index aabe19fd70..3158f285b6 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/UserAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/UserAdapter.java @@ -28,7 +28,6 @@ import org.keycloak.models.jpa.entities.UserRoleMappingEntity; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.common.util.Time; -import org.keycloak.hash.PasswordHashProvider; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupEntity.java index 2326cad628..da11f2e89a 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupEntity.java @@ -1,7 +1,5 @@ package org.keycloak.models.jpa.entities; -import org.keycloak.models.utils.KeycloakModelUtils; - import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; @@ -13,7 +11,6 @@ import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.OneToMany; import javax.persistence.Table; -import javax.persistence.UniqueConstraint; import java.util.ArrayList; import java.util.Collection; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRequiredActionEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRequiredActionEntity.java index 6cab06d288..75606ea9a7 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRequiredActionEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRequiredActionEntity.java @@ -1,7 +1,5 @@ package org.keycloak.models.jpa.entities; -import org.keycloak.models.UserModel; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; diff --git a/model/mongo/pom.xml b/model/mongo/pom.xml index 4ae2e8201a..d6ccf20636 100755 --- a/model/mongo/pom.xml +++ b/model/mongo/pom.xml @@ -27,7 +27,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/ClientAdapter.java b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/ClientAdapter.java index 455a80b4b1..48522b8151 100755 --- a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/ClientAdapter.java +++ b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/ClientAdapter.java @@ -10,7 +10,6 @@ import org.keycloak.models.ModelDuplicateException; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; -import org.keycloak.models.ScopeContainerModel; import org.keycloak.models.entities.ProtocolMapperEntity; import org.keycloak.models.mongo.keycloak.entities.MongoClientEntity; import org.keycloak.models.mongo.keycloak.entities.MongoRoleEntity; diff --git a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/ClientTemplateAdapter.java b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/ClientTemplateAdapter.java index 9b2d9215ac..05ad4aa211 100755 --- a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/ClientTemplateAdapter.java +++ b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/ClientTemplateAdapter.java @@ -1,25 +1,18 @@ package org.keycloak.models.mongo.keycloak.adapters; -import com.mongodb.DBObject; -import com.mongodb.QueryBuilder; import org.keycloak.connections.mongo.api.context.MongoStoreInvocationContext; -import org.keycloak.models.ClientModel; import org.keycloak.models.ClientTemplateModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ModelDuplicateException; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; -import org.keycloak.models.entities.ClientTemplateEntity; import org.keycloak.models.entities.ProtocolMapperEntity; -import org.keycloak.models.mongo.keycloak.entities.MongoClientEntity; import org.keycloak.models.mongo.keycloak.entities.MongoClientTemplateEntity; import org.keycloak.models.mongo.keycloak.entities.MongoRoleEntity; import org.keycloak.models.mongo.utils.MongoModelUtils; import org.keycloak.models.utils.KeycloakModelUtils; -import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; diff --git a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/GroupAdapter.java b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/GroupAdapter.java index 16fd3695b8..778e3a60b9 100755 --- a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/GroupAdapter.java +++ b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/GroupAdapter.java @@ -8,20 +8,14 @@ import org.keycloak.models.GroupModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ModelException; import org.keycloak.models.RealmModel; -import org.keycloak.models.RoleContainerModel; import org.keycloak.models.RoleModel; -import org.keycloak.models.mongo.keycloak.entities.MongoClientEntity; import org.keycloak.models.mongo.keycloak.entities.MongoGroupEntity; -import org.keycloak.models.mongo.keycloak.entities.MongoRealmEntity; -import org.keycloak.models.mongo.keycloak.entities.MongoRoleEntity; -import org.keycloak.models.mongo.utils.MongoModelUtils; import org.keycloak.models.utils.KeycloakModelUtils; import java.util.ArrayList; 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; diff --git a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MigrationModelAdapter.java b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MigrationModelAdapter.java index 898b0e3c67..a023eef612 100755 --- a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MigrationModelAdapter.java +++ b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MigrationModelAdapter.java @@ -1,28 +1,9 @@ package org.keycloak.models.mongo.keycloak.adapters; -import com.mongodb.DBObject; -import com.mongodb.QueryBuilder; import org.keycloak.connections.mongo.api.context.MongoStoreInvocationContext; import org.keycloak.migration.MigrationModel; -import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.models.RealmModel; -import org.keycloak.models.RoleModel; -import org.keycloak.models.entities.ProtocolMapperEntity; -import org.keycloak.models.mongo.keycloak.entities.MongoClientEntity; import org.keycloak.models.mongo.keycloak.entities.MongoMigrationModelEntity; -import org.keycloak.models.mongo.keycloak.entities.MongoRoleEntity; -import org.keycloak.models.mongo.utils.MongoModelUtils; -import org.keycloak.models.utils.KeycloakModelUtils; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; /** * @author Marek Posolda diff --git a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/UserAdapter.java b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/UserAdapter.java index 9c585022be..29804d22b9 100755 --- a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/UserAdapter.java +++ b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/UserAdapter.java @@ -26,7 +26,6 @@ import org.keycloak.models.mongo.keycloak.entities.MongoUserEntity; import org.keycloak.models.mongo.utils.MongoModelUtils; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.common.util.Time; -import org.keycloak.hash.PasswordHashProvider; import java.util.ArrayList; import java.util.Collections; diff --git a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/entities/MongoClientTemplateEntity.java b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/entities/MongoClientTemplateEntity.java index ab511051a7..58fdbebbbf 100755 --- a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/entities/MongoClientTemplateEntity.java +++ b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/entities/MongoClientTemplateEntity.java @@ -1,11 +1,8 @@ package org.keycloak.models.mongo.keycloak.entities; -import com.mongodb.DBObject; -import com.mongodb.QueryBuilder; import org.keycloak.connections.mongo.api.MongoCollection; import org.keycloak.connections.mongo.api.MongoIdentifiableEntity; import org.keycloak.connections.mongo.api.context.MongoStoreInvocationContext; -import org.keycloak.models.entities.ClientEntity; import org.keycloak.models.entities.ClientTemplateEntity; /** diff --git a/model/mongo/src/main/java/org/keycloak/models/mongo/utils/MongoModelUtils.java b/model/mongo/src/main/java/org/keycloak/models/mongo/utils/MongoModelUtils.java index 907b29d26c..dfc9182225 100755 --- a/model/mongo/src/main/java/org/keycloak/models/mongo/utils/MongoModelUtils.java +++ b/model/mongo/src/main/java/org/keycloak/models/mongo/utils/MongoModelUtils.java @@ -5,7 +5,6 @@ import com.mongodb.QueryBuilder; import org.keycloak.connections.mongo.api.context.MongoStoreInvocationContext; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientTemplateModel; -import org.keycloak.models.GroupModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; @@ -13,7 +12,6 @@ import org.keycloak.models.entities.ClientEntity; import org.keycloak.models.entities.ClientTemplateEntity; import org.keycloak.models.mongo.keycloak.adapters.ClientAdapter; import org.keycloak.models.mongo.keycloak.adapters.ClientTemplateAdapter; -import org.keycloak.models.mongo.keycloak.adapters.GroupAdapter; import org.keycloak.models.mongo.keycloak.adapters.UserAdapter; import org.keycloak.models.mongo.keycloak.entities.MongoRoleEntity; import org.keycloak.models.mongo.keycloak.entities.MongoUserEntity; diff --git a/model/pom.xml b/model/pom.xml index 58c87e77b6..2236cb3913 100755 --- a/model/pom.xml +++ b/model/pom.xml @@ -25,7 +25,6 @@ - api invalidation-cache jpa mongo diff --git a/model/sessions-infinispan/pom.xml b/model/sessions-infinispan/pom.xml index 66cbc4141b..0a899991ac 100755 --- a/model/sessions-infinispan/pom.xml +++ b/model/sessions-infinispan/pom.xml @@ -20,7 +20,8 @@ org.keycloak - keycloak-model-api + keycloak-server-spi + provided org.keycloak diff --git a/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java b/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java index 7e66b12b2a..ce7ebf143c 100755 --- a/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java +++ b/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java @@ -14,7 +14,6 @@ import org.keycloak.models.utils.RealmInfoUtil; import java.util.*; import java.util.function.Consumer; import java.util.function.Predicate; -import java.util.stream.Collectors; import java.util.stream.Stream; /** diff --git a/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/UserSessionAdapter.java b/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/UserSessionAdapter.java index 1601acb798..937434b13c 100755 --- a/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/UserSessionAdapter.java +++ b/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/UserSessionAdapter.java @@ -6,7 +6,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; -import org.keycloak.models.sessions.infinispan.entities.ClientSessionEntity; import org.keycloak.models.sessions.infinispan.entities.SessionEntity; import org.keycloak.models.sessions.infinispan.entities.UserSessionEntity; diff --git a/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/ClientSessionEntity.java b/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/ClientSessionEntity.java index b260b331c7..91fe9d656e 100755 --- a/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/ClientSessionEntity.java +++ b/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/ClientSessionEntity.java @@ -4,8 +4,6 @@ import org.keycloak.models.ClientSessionModel; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; import java.util.Map; import java.util.Set; diff --git a/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/initializer/InfinispanUserSessionInitializer.java b/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/initializer/InfinispanUserSessionInitializer.java old mode 100644 new mode 100755 index 2a9058d643..ad2865fbce --- a/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/initializer/InfinispanUserSessionInitializer.java +++ b/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/initializer/InfinispanUserSessionInitializer.java @@ -13,7 +13,6 @@ import java.util.concurrent.TimeUnit; import org.infinispan.Cache; import org.infinispan.context.Flag; import org.infinispan.distexec.DefaultExecutorService; -import org.infinispan.distexec.DistributedExecutorService; import org.infinispan.notifications.Listener; import org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged; import org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent; diff --git a/pom.xml b/pom.xml index c56864e90e..a3b479395f 100755 --- a/pom.xml +++ b/pom.xml @@ -143,6 +143,7 @@ connections dependencies events + server-spi model integration proxy @@ -153,11 +154,11 @@ social forms examples - testsuite timer export-import util wildfly + testsuite @@ -985,7 +986,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi ${project.version} diff --git a/saml/saml-protocol/pom.xml b/saml/saml-protocol/pom.xml index 567f7754c1..979b8fc380 100755 --- a/saml/saml-protocol/pom.xml +++ b/saml/saml-protocol/pom.xml @@ -70,7 +70,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlClient.java b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlClient.java index 3ddd8831f5..b6df68fcc1 100755 --- a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlClient.java +++ b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlClient.java @@ -3,7 +3,6 @@ package org.keycloak.protocol.saml; import org.keycloak.models.ClientConfigResolver; import org.keycloak.models.ClientModel; import org.keycloak.saml.SignatureAlgorithm; -import org.keycloak.saml.common.constants.GeneralConstants; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; /** diff --git a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlClientTemplate.java b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlClientTemplate.java index ae6d491795..3667fdafa9 100755 --- a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlClientTemplate.java +++ b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlClientTemplate.java @@ -1,6 +1,5 @@ package org.keycloak.protocol.saml; -import org.keycloak.models.ClientModel; import org.keycloak.models.ClientTemplateModel; import org.keycloak.saml.SignatureAlgorithm; diff --git a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlProtocol.java b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlProtocol.java index d6af4d8b33..e7502c9853 100755 --- a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlProtocol.java +++ b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlProtocol.java @@ -58,7 +58,6 @@ import org.keycloak.services.managers.ClientSessionCode; import org.keycloak.services.managers.ResourceAdminManager; import org.keycloak.services.messages.Messages; import org.keycloak.services.resources.RealmsResource; -import org.keycloak.services.resources.admin.ClientAttributeCertificateResource; import org.w3c.dom.Document; /** diff --git a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/clientregistration/EntityDescriptorClientRegistrationProvider.java b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/clientregistration/EntityDescriptorClientRegistrationProvider.java old mode 100644 new mode 100755 index 10ef0191c4..1ee3cd2bff --- a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/clientregistration/EntityDescriptorClientRegistrationProvider.java +++ b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/clientregistration/EntityDescriptorClientRegistrationProvider.java @@ -5,7 +5,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.saml.EntityDescriptorDescriptionConverter; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.services.clientregistration.AbstractClientRegistrationProvider; -import org.keycloak.services.clientregistration.ClientRegistrationException; import javax.ws.rs.Consumes; import javax.ws.rs.POST; diff --git a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlClientInstallation.java b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlClientInstallation.java index d3abddf054..1fb742eb84 100755 --- a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlClientInstallation.java +++ b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlClientInstallation.java @@ -14,7 +14,6 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import java.net.URI; -import java.util.Map; /** * @author Bill Burke diff --git a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/GroupMembershipMapper.java b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/GroupMembershipMapper.java index 2253e5c405..e4af4e2d53 100755 --- a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/GroupMembershipMapper.java +++ b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/GroupMembershipMapper.java @@ -5,22 +5,16 @@ import org.keycloak.dom.saml.v2.assertion.AttributeType; import org.keycloak.models.ClientSessionModel; import org.keycloak.models.GroupModel; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.models.RoleModel; import org.keycloak.models.UserSessionModel; import org.keycloak.models.utils.ModelToRepresentation; -import org.keycloak.protocol.ProtocolMapper; import org.keycloak.protocol.saml.SamlProtocol; import org.keycloak.provider.ProviderConfigProperty; -import org.keycloak.services.managers.ClientSessionCode; import java.util.ArrayList; import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Set; /** * @author Bill Burke diff --git a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/RoleNameMapper.java b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/RoleNameMapper.java index 9974469e27..ea91530493 100755 --- a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/RoleNameMapper.java +++ b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/RoleNameMapper.java @@ -3,9 +3,7 @@ package org.keycloak.protocol.saml.mappers; import org.keycloak.Config; import org.keycloak.models.*; import org.keycloak.protocol.ProtocolMapper; -import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.provider.ProviderConfigProperty; -import org.keycloak.protocol.oidc.mappers.AbstractOIDCProtocolMapper; import org.keycloak.protocol.saml.SamlProtocol; import java.util.ArrayList; diff --git a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserSessionNoteStatementMapper.java b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserSessionNoteStatementMapper.java index ccf4c1f555..445555be99 100755 --- a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserSessionNoteStatementMapper.java +++ b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserSessionNoteStatementMapper.java @@ -4,9 +4,7 @@ import org.keycloak.dom.saml.v2.assertion.AttributeStatementType; import org.keycloak.models.ClientSessionModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; -import org.keycloak.protocol.ProtocolMapperUtils; import org.keycloak.provider.ProviderConfigProperty; import java.util.ArrayList; diff --git a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticator.java b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticator.java old mode 100644 new mode 100755 index 2e1550229b..41ac46cdbc --- a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticator.java +++ b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticator.java @@ -11,13 +11,10 @@ import org.keycloak.events.Errors; import org.keycloak.models.*; import org.keycloak.models.AuthenticationExecutionModel.Requirement; import org.keycloak.provider.ProviderConfigProperty; -import org.keycloak.representations.AccessTokenResponse; -import org.keycloak.representations.idm.CredentialRepresentation; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import java.io.IOException; -import java.util.LinkedList; import java.util.List; /** diff --git a/model/api/pom.xml b/server-spi/pom.xml similarity index 93% rename from model/api/pom.xml rename to server-spi/pom.xml index 4f837d852a..a4a213aabd 100755 --- a/model/api/pom.xml +++ b/server-spi/pom.xml @@ -5,12 +5,12 @@ keycloak-parent org.keycloak 1.9.0.CR1-SNAPSHOT - ../../pom.xml + ../pom.xml 4.0.0 - keycloak-model-api - Keycloak Model API + keycloak-server-spi + Keycloak Server SPI diff --git a/model/api/src/main/java/org/keycloak/hash/PasswordHashManager.java b/server-spi/src/main/java/org/keycloak/hash/PasswordHashManager.java similarity index 100% rename from model/api/src/main/java/org/keycloak/hash/PasswordHashManager.java rename to server-spi/src/main/java/org/keycloak/hash/PasswordHashManager.java diff --git a/model/api/src/main/java/org/keycloak/hash/PasswordHashProvider.java b/server-spi/src/main/java/org/keycloak/hash/PasswordHashProvider.java similarity index 100% rename from model/api/src/main/java/org/keycloak/hash/PasswordHashProvider.java rename to server-spi/src/main/java/org/keycloak/hash/PasswordHashProvider.java diff --git a/model/api/src/main/java/org/keycloak/hash/PasswordHashProviderFactory.java b/server-spi/src/main/java/org/keycloak/hash/PasswordHashProviderFactory.java similarity index 100% rename from model/api/src/main/java/org/keycloak/hash/PasswordHashProviderFactory.java rename to server-spi/src/main/java/org/keycloak/hash/PasswordHashProviderFactory.java diff --git a/model/api/src/main/java/org/keycloak/hash/PasswordHashSpi.java b/server-spi/src/main/java/org/keycloak/hash/PasswordHashSpi.java similarity index 100% rename from model/api/src/main/java/org/keycloak/hash/PasswordHashSpi.java rename to server-spi/src/main/java/org/keycloak/hash/PasswordHashSpi.java diff --git a/model/api/src/main/java/org/keycloak/hash/Pbkdf2PasswordHashProvider.java b/server-spi/src/main/java/org/keycloak/hash/Pbkdf2PasswordHashProvider.java similarity index 100% rename from model/api/src/main/java/org/keycloak/hash/Pbkdf2PasswordHashProvider.java rename to server-spi/src/main/java/org/keycloak/hash/Pbkdf2PasswordHashProvider.java diff --git a/model/api/src/main/java/org/keycloak/mappers/MapperConfigValidationException.java b/server-spi/src/main/java/org/keycloak/mappers/MapperConfigValidationException.java similarity index 100% rename from model/api/src/main/java/org/keycloak/mappers/MapperConfigValidationException.java rename to server-spi/src/main/java/org/keycloak/mappers/MapperConfigValidationException.java diff --git a/model/api/src/main/java/org/keycloak/mappers/UserFederationMapper.java b/server-spi/src/main/java/org/keycloak/mappers/UserFederationMapper.java similarity index 100% rename from model/api/src/main/java/org/keycloak/mappers/UserFederationMapper.java rename to server-spi/src/main/java/org/keycloak/mappers/UserFederationMapper.java diff --git a/model/api/src/main/java/org/keycloak/mappers/UserFederationMapperFactory.java b/server-spi/src/main/java/org/keycloak/mappers/UserFederationMapperFactory.java similarity index 100% rename from model/api/src/main/java/org/keycloak/mappers/UserFederationMapperFactory.java rename to server-spi/src/main/java/org/keycloak/mappers/UserFederationMapperFactory.java diff --git a/model/api/src/main/java/org/keycloak/mappers/UserFederationMapperSpi.java b/server-spi/src/main/java/org/keycloak/mappers/UserFederationMapperSpi.java similarity index 100% rename from model/api/src/main/java/org/keycloak/mappers/UserFederationMapperSpi.java rename to server-spi/src/main/java/org/keycloak/mappers/UserFederationMapperSpi.java diff --git a/model/api/src/main/java/org/keycloak/migration/MigrationModel.java b/server-spi/src/main/java/org/keycloak/migration/MigrationModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/migration/MigrationModel.java rename to server-spi/src/main/java/org/keycloak/migration/MigrationModel.java diff --git a/model/api/src/main/java/org/keycloak/migration/MigrationModelManager.java b/server-spi/src/main/java/org/keycloak/migration/MigrationModelManager.java similarity index 100% rename from model/api/src/main/java/org/keycloak/migration/MigrationModelManager.java rename to server-spi/src/main/java/org/keycloak/migration/MigrationModelManager.java diff --git a/model/api/src/main/java/org/keycloak/migration/MigrationProvider.java b/server-spi/src/main/java/org/keycloak/migration/MigrationProvider.java similarity index 100% rename from model/api/src/main/java/org/keycloak/migration/MigrationProvider.java rename to server-spi/src/main/java/org/keycloak/migration/MigrationProvider.java diff --git a/model/api/src/main/java/org/keycloak/migration/MigrationProviderFactory.java b/server-spi/src/main/java/org/keycloak/migration/MigrationProviderFactory.java similarity index 100% rename from model/api/src/main/java/org/keycloak/migration/MigrationProviderFactory.java rename to server-spi/src/main/java/org/keycloak/migration/MigrationProviderFactory.java diff --git a/model/api/src/main/java/org/keycloak/migration/MigrationSpi.java b/server-spi/src/main/java/org/keycloak/migration/MigrationSpi.java similarity index 100% rename from model/api/src/main/java/org/keycloak/migration/MigrationSpi.java rename to server-spi/src/main/java/org/keycloak/migration/MigrationSpi.java diff --git a/model/api/src/main/java/org/keycloak/migration/ModelVersion.java b/server-spi/src/main/java/org/keycloak/migration/ModelVersion.java similarity index 100% rename from model/api/src/main/java/org/keycloak/migration/ModelVersion.java rename to server-spi/src/main/java/org/keycloak/migration/ModelVersion.java diff --git a/model/api/src/main/java/org/keycloak/migration/migrators/MigrateTo1_3_0.java b/server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_3_0.java similarity index 96% rename from model/api/src/main/java/org/keycloak/migration/migrators/MigrateTo1_3_0.java rename to server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_3_0.java index 43209a80d9..32686786da 100755 --- a/model/api/src/main/java/org/keycloak/migration/migrators/MigrateTo1_3_0.java +++ b/server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_3_0.java @@ -9,8 +9,6 @@ import org.keycloak.models.UserFederationMapperModel; import org.keycloak.models.UserFederationProvider; import org.keycloak.models.UserFederationProviderFactory; import org.keycloak.models.UserFederationProviderModel; -import org.keycloak.models.utils.DefaultAuthenticationFlows; -import org.keycloak.models.utils.DefaultRequiredActions; import java.util.List; import java.util.Map; diff --git a/model/api/src/main/java/org/keycloak/migration/migrators/MigrateTo1_4_0.java b/server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_4_0.java similarity index 100% rename from model/api/src/main/java/org/keycloak/migration/migrators/MigrateTo1_4_0.java rename to server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_4_0.java diff --git a/model/api/src/main/java/org/keycloak/migration/migrators/MigrateTo1_5_0.java b/server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_5_0.java similarity index 90% rename from model/api/src/main/java/org/keycloak/migration/migrators/MigrateTo1_5_0.java rename to server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_5_0.java index cbe0eb7e40..fce409522b 100755 --- a/model/api/src/main/java/org/keycloak/migration/migrators/MigrateTo1_5_0.java +++ b/server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_5_0.java @@ -3,17 +3,12 @@ package org.keycloak.migration.migrators; import org.keycloak.migration.ModelVersion; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.ClientModel; -import org.keycloak.models.ImpersonationConstants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.OTPPolicy; import org.keycloak.models.RealmModel; -import org.keycloak.models.UserFederationMapperModel; -import org.keycloak.models.UserModel; import org.keycloak.models.utils.DefaultAuthenticationFlows; -import org.keycloak.models.utils.DefaultRequiredActions; import org.keycloak.models.utils.KeycloakModelUtils; -import java.util.Arrays; import java.util.List; /** diff --git a/model/api/src/main/java/org/keycloak/migration/migrators/MigrateTo1_6_0.java b/server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_6_0.java similarity index 100% rename from model/api/src/main/java/org/keycloak/migration/migrators/MigrateTo1_6_0.java rename to server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_6_0.java diff --git a/model/api/src/main/java/org/keycloak/migration/migrators/MigrateTo1_7_0.java b/server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_7_0.java similarity index 100% rename from model/api/src/main/java/org/keycloak/migration/migrators/MigrateTo1_7_0.java rename to server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_7_0.java diff --git a/model/api/src/main/java/org/keycloak/migration/migrators/MigrateTo1_8_0.java b/server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_8_0.java similarity index 100% rename from model/api/src/main/java/org/keycloak/migration/migrators/MigrateTo1_8_0.java rename to server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_8_0.java diff --git a/model/api/src/main/java/org/keycloak/migration/migrators/MigrationTo1_2_0_CR1.java b/server-spi/src/main/java/org/keycloak/migration/migrators/MigrationTo1_2_0_CR1.java similarity index 100% rename from model/api/src/main/java/org/keycloak/migration/migrators/MigrationTo1_2_0_CR1.java rename to server-spi/src/main/java/org/keycloak/migration/migrators/MigrationTo1_2_0_CR1.java diff --git a/model/api/src/main/java/org/keycloak/models/AccountRoles.java b/server-spi/src/main/java/org/keycloak/models/AccountRoles.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/AccountRoles.java rename to server-spi/src/main/java/org/keycloak/models/AccountRoles.java diff --git a/model/api/src/main/java/org/keycloak/models/AdminRoles.java b/server-spi/src/main/java/org/keycloak/models/AdminRoles.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/AdminRoles.java rename to server-spi/src/main/java/org/keycloak/models/AdminRoles.java diff --git a/model/api/src/main/java/org/keycloak/models/AuthenticationExecutionModel.java b/server-spi/src/main/java/org/keycloak/models/AuthenticationExecutionModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/AuthenticationExecutionModel.java rename to server-spi/src/main/java/org/keycloak/models/AuthenticationExecutionModel.java diff --git a/model/api/src/main/java/org/keycloak/models/AuthenticationFlowModel.java b/server-spi/src/main/java/org/keycloak/models/AuthenticationFlowModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/AuthenticationFlowModel.java rename to server-spi/src/main/java/org/keycloak/models/AuthenticationFlowModel.java diff --git a/model/api/src/main/java/org/keycloak/models/AuthenticatorConfigModel.java b/server-spi/src/main/java/org/keycloak/models/AuthenticatorConfigModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/AuthenticatorConfigModel.java rename to server-spi/src/main/java/org/keycloak/models/AuthenticatorConfigModel.java diff --git a/model/api/src/main/java/org/keycloak/models/BrowserSecurityHeaders.java b/server-spi/src/main/java/org/keycloak/models/BrowserSecurityHeaders.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/BrowserSecurityHeaders.java rename to server-spi/src/main/java/org/keycloak/models/BrowserSecurityHeaders.java diff --git a/model/api/src/main/java/org/keycloak/models/ClaimMask.java b/server-spi/src/main/java/org/keycloak/models/ClaimMask.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/ClaimMask.java rename to server-spi/src/main/java/org/keycloak/models/ClaimMask.java diff --git a/model/api/src/main/java/org/keycloak/models/ClaimTypeModel.java b/server-spi/src/main/java/org/keycloak/models/ClaimTypeModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/ClaimTypeModel.java rename to server-spi/src/main/java/org/keycloak/models/ClaimTypeModel.java diff --git a/model/api/src/main/java/org/keycloak/models/ClientConfigResolver.java b/server-spi/src/main/java/org/keycloak/models/ClientConfigResolver.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/ClientConfigResolver.java rename to server-spi/src/main/java/org/keycloak/models/ClientConfigResolver.java diff --git a/model/api/src/main/java/org/keycloak/models/ClientInitialAccessModel.java b/server-spi/src/main/java/org/keycloak/models/ClientInitialAccessModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/ClientInitialAccessModel.java rename to server-spi/src/main/java/org/keycloak/models/ClientInitialAccessModel.java diff --git a/model/api/src/main/java/org/keycloak/models/ClientModel.java b/server-spi/src/main/java/org/keycloak/models/ClientModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/ClientModel.java rename to server-spi/src/main/java/org/keycloak/models/ClientModel.java diff --git a/model/api/src/main/java/org/keycloak/models/ClientSessionModel.java b/server-spi/src/main/java/org/keycloak/models/ClientSessionModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/ClientSessionModel.java rename to server-spi/src/main/java/org/keycloak/models/ClientSessionModel.java diff --git a/model/api/src/main/java/org/keycloak/models/ClientTemplateModel.java b/server-spi/src/main/java/org/keycloak/models/ClientTemplateModel.java similarity index 96% rename from model/api/src/main/java/org/keycloak/models/ClientTemplateModel.java rename to server-spi/src/main/java/org/keycloak/models/ClientTemplateModel.java index eb3fbc0342..f013e24b9b 100755 --- a/model/api/src/main/java/org/keycloak/models/ClientTemplateModel.java +++ b/server-spi/src/main/java/org/keycloak/models/ClientTemplateModel.java @@ -1,8 +1,6 @@ package org.keycloak.models; -import java.util.List; import java.util.Map; -import java.util.Set; /** * @author Bill Burke diff --git a/model/api/src/main/java/org/keycloak/models/Constants.java b/server-spi/src/main/java/org/keycloak/models/Constants.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/Constants.java rename to server-spi/src/main/java/org/keycloak/models/Constants.java diff --git a/model/api/src/main/java/org/keycloak/models/CredentialValidationOutput.java b/server-spi/src/main/java/org/keycloak/models/CredentialValidationOutput.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/CredentialValidationOutput.java rename to server-spi/src/main/java/org/keycloak/models/CredentialValidationOutput.java diff --git a/model/api/src/main/java/org/keycloak/models/FederatedIdentityModel.java b/server-spi/src/main/java/org/keycloak/models/FederatedIdentityModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/FederatedIdentityModel.java rename to server-spi/src/main/java/org/keycloak/models/FederatedIdentityModel.java diff --git a/model/api/src/main/java/org/keycloak/models/GroupModel.java b/server-spi/src/main/java/org/keycloak/models/GroupModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/GroupModel.java rename to server-spi/src/main/java/org/keycloak/models/GroupModel.java diff --git a/model/api/src/main/java/org/keycloak/models/IdentityProviderMapperModel.java b/server-spi/src/main/java/org/keycloak/models/IdentityProviderMapperModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/IdentityProviderMapperModel.java rename to server-spi/src/main/java/org/keycloak/models/IdentityProviderMapperModel.java diff --git a/model/api/src/main/java/org/keycloak/models/IdentityProviderModel.java b/server-spi/src/main/java/org/keycloak/models/IdentityProviderModel.java similarity index 98% rename from model/api/src/main/java/org/keycloak/models/IdentityProviderModel.java rename to server-spi/src/main/java/org/keycloak/models/IdentityProviderModel.java index 2f7e9af2fc..f437a0e111 100755 --- a/model/api/src/main/java/org/keycloak/models/IdentityProviderModel.java +++ b/server-spi/src/main/java/org/keycloak/models/IdentityProviderModel.java @@ -21,8 +21,6 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.keycloak.representations.idm.IdentityProviderRepresentation; - /** *

A model type representing the configuration for identity providers. It provides some common properties and also a {@link org.keycloak.models.IdentityProviderModel#config} * for configuration options and properties specifics to a identity provider.

diff --git a/model/api/src/main/java/org/keycloak/models/ImpersonationConstants.java b/server-spi/src/main/java/org/keycloak/models/ImpersonationConstants.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/ImpersonationConstants.java rename to server-spi/src/main/java/org/keycloak/models/ImpersonationConstants.java diff --git a/model/api/src/main/java/org/keycloak/models/KeycloakContext.java b/server-spi/src/main/java/org/keycloak/models/KeycloakContext.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/KeycloakContext.java rename to server-spi/src/main/java/org/keycloak/models/KeycloakContext.java diff --git a/model/api/src/main/java/org/keycloak/models/KeycloakSession.java b/server-spi/src/main/java/org/keycloak/models/KeycloakSession.java similarity index 97% rename from model/api/src/main/java/org/keycloak/models/KeycloakSession.java rename to server-spi/src/main/java/org/keycloak/models/KeycloakSession.java index 27a43be7d8..77cc36f636 100755 --- a/model/api/src/main/java/org/keycloak/models/KeycloakSession.java +++ b/server-spi/src/main/java/org/keycloak/models/KeycloakSession.java @@ -1,6 +1,5 @@ package org.keycloak.models; -import org.keycloak.migration.MigrationModel; import org.keycloak.provider.Provider; import java.util.Set; diff --git a/model/api/src/main/java/org/keycloak/models/KeycloakSessionFactory.java b/server-spi/src/main/java/org/keycloak/models/KeycloakSessionFactory.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/KeycloakSessionFactory.java rename to server-spi/src/main/java/org/keycloak/models/KeycloakSessionFactory.java diff --git a/model/api/src/main/java/org/keycloak/models/KeycloakSessionTask.java b/server-spi/src/main/java/org/keycloak/models/KeycloakSessionTask.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/KeycloakSessionTask.java rename to server-spi/src/main/java/org/keycloak/models/KeycloakSessionTask.java diff --git a/model/api/src/main/java/org/keycloak/models/KeycloakTransaction.java b/server-spi/src/main/java/org/keycloak/models/KeycloakTransaction.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/KeycloakTransaction.java rename to server-spi/src/main/java/org/keycloak/models/KeycloakTransaction.java diff --git a/model/api/src/main/java/org/keycloak/models/KeycloakTransactionManager.java b/server-spi/src/main/java/org/keycloak/models/KeycloakTransactionManager.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/KeycloakTransactionManager.java rename to server-spi/src/main/java/org/keycloak/models/KeycloakTransactionManager.java diff --git a/model/api/src/main/java/org/keycloak/models/LDAPConstants.java b/server-spi/src/main/java/org/keycloak/models/LDAPConstants.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/LDAPConstants.java rename to server-spi/src/main/java/org/keycloak/models/LDAPConstants.java diff --git a/model/api/src/main/java/org/keycloak/models/ModelDuplicateException.java b/server-spi/src/main/java/org/keycloak/models/ModelDuplicateException.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/ModelDuplicateException.java rename to server-spi/src/main/java/org/keycloak/models/ModelDuplicateException.java diff --git a/model/api/src/main/java/org/keycloak/models/ModelException.java b/server-spi/src/main/java/org/keycloak/models/ModelException.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/ModelException.java rename to server-spi/src/main/java/org/keycloak/models/ModelException.java diff --git a/model/api/src/main/java/org/keycloak/models/ModelReadOnlyException.java b/server-spi/src/main/java/org/keycloak/models/ModelReadOnlyException.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/ModelReadOnlyException.java rename to server-spi/src/main/java/org/keycloak/models/ModelReadOnlyException.java diff --git a/model/api/src/main/java/org/keycloak/models/OTPPolicy.java b/server-spi/src/main/java/org/keycloak/models/OTPPolicy.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/OTPPolicy.java rename to server-spi/src/main/java/org/keycloak/models/OTPPolicy.java diff --git a/model/api/src/main/java/org/keycloak/models/PasswordPolicy.java b/server-spi/src/main/java/org/keycloak/models/PasswordPolicy.java similarity index 99% rename from model/api/src/main/java/org/keycloak/models/PasswordPolicy.java rename to server-spi/src/main/java/org/keycloak/models/PasswordPolicy.java index 211b8a25be..a45e9f2ec3 100755 --- a/model/api/src/main/java/org/keycloak/models/PasswordPolicy.java +++ b/server-spi/src/main/java/org/keycloak/models/PasswordPolicy.java @@ -1,7 +1,6 @@ package org.keycloak.models; import org.keycloak.hash.PasswordHashManager; -import org.keycloak.hash.PasswordHashProvider; import java.io.Serializable; import java.util.ArrayList; diff --git a/model/api/src/main/java/org/keycloak/models/ProtocolMapperContainerModel.java b/server-spi/src/main/java/org/keycloak/models/ProtocolMapperContainerModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/ProtocolMapperContainerModel.java rename to server-spi/src/main/java/org/keycloak/models/ProtocolMapperContainerModel.java diff --git a/model/api/src/main/java/org/keycloak/models/ProtocolMapperModel.java b/server-spi/src/main/java/org/keycloak/models/ProtocolMapperModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/ProtocolMapperModel.java rename to server-spi/src/main/java/org/keycloak/models/ProtocolMapperModel.java diff --git a/model/api/src/main/java/org/keycloak/models/RealmModel.java b/server-spi/src/main/java/org/keycloak/models/RealmModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/RealmModel.java rename to server-spi/src/main/java/org/keycloak/models/RealmModel.java diff --git a/model/api/src/main/java/org/keycloak/models/RealmProvider.java b/server-spi/src/main/java/org/keycloak/models/RealmProvider.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/RealmProvider.java rename to server-spi/src/main/java/org/keycloak/models/RealmProvider.java diff --git a/model/api/src/main/java/org/keycloak/models/RealmProviderFactory.java b/server-spi/src/main/java/org/keycloak/models/RealmProviderFactory.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/RealmProviderFactory.java rename to server-spi/src/main/java/org/keycloak/models/RealmProviderFactory.java diff --git a/model/api/src/main/java/org/keycloak/models/RealmSpi.java b/server-spi/src/main/java/org/keycloak/models/RealmSpi.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/RealmSpi.java rename to server-spi/src/main/java/org/keycloak/models/RealmSpi.java diff --git a/model/api/src/main/java/org/keycloak/models/RequiredActionProviderModel.java b/server-spi/src/main/java/org/keycloak/models/RequiredActionProviderModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/RequiredActionProviderModel.java rename to server-spi/src/main/java/org/keycloak/models/RequiredActionProviderModel.java diff --git a/model/api/src/main/java/org/keycloak/models/RequiredCredentialModel.java b/server-spi/src/main/java/org/keycloak/models/RequiredCredentialModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/RequiredCredentialModel.java rename to server-spi/src/main/java/org/keycloak/models/RequiredCredentialModel.java diff --git a/model/api/src/main/java/org/keycloak/models/RoleContainerModel.java b/server-spi/src/main/java/org/keycloak/models/RoleContainerModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/RoleContainerModel.java rename to server-spi/src/main/java/org/keycloak/models/RoleContainerModel.java diff --git a/model/api/src/main/java/org/keycloak/models/RoleMapperModel.java b/server-spi/src/main/java/org/keycloak/models/RoleMapperModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/RoleMapperModel.java rename to server-spi/src/main/java/org/keycloak/models/RoleMapperModel.java diff --git a/model/api/src/main/java/org/keycloak/models/RoleModel.java b/server-spi/src/main/java/org/keycloak/models/RoleModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/RoleModel.java rename to server-spi/src/main/java/org/keycloak/models/RoleModel.java diff --git a/model/api/src/main/java/org/keycloak/models/ScopeContainerModel.java b/server-spi/src/main/java/org/keycloak/models/ScopeContainerModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/ScopeContainerModel.java rename to server-spi/src/main/java/org/keycloak/models/ScopeContainerModel.java diff --git a/model/api/src/main/java/org/keycloak/models/UserConsentModel.java b/server-spi/src/main/java/org/keycloak/models/UserConsentModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/UserConsentModel.java rename to server-spi/src/main/java/org/keycloak/models/UserConsentModel.java diff --git a/model/api/src/main/java/org/keycloak/models/UserCredentialModel.java b/server-spi/src/main/java/org/keycloak/models/UserCredentialModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/UserCredentialModel.java rename to server-spi/src/main/java/org/keycloak/models/UserCredentialModel.java diff --git a/model/api/src/main/java/org/keycloak/models/UserCredentialValueModel.java b/server-spi/src/main/java/org/keycloak/models/UserCredentialValueModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/UserCredentialValueModel.java rename to server-spi/src/main/java/org/keycloak/models/UserCredentialValueModel.java diff --git a/model/api/src/main/java/org/keycloak/models/UserFederationEventAwareProviderFactory.java b/server-spi/src/main/java/org/keycloak/models/UserFederationEventAwareProviderFactory.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/UserFederationEventAwareProviderFactory.java rename to server-spi/src/main/java/org/keycloak/models/UserFederationEventAwareProviderFactory.java diff --git a/model/api/src/main/java/org/keycloak/models/UserFederationManager.java b/server-spi/src/main/java/org/keycloak/models/UserFederationManager.java similarity index 99% rename from model/api/src/main/java/org/keycloak/models/UserFederationManager.java rename to server-spi/src/main/java/org/keycloak/models/UserFederationManager.java index f69d1d5b51..3169ea4605 100755 --- a/model/api/src/main/java/org/keycloak/models/UserFederationManager.java +++ b/server-spi/src/main/java/org/keycloak/models/UserFederationManager.java @@ -4,7 +4,6 @@ import org.jboss.logging.Logger; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashSet; diff --git a/model/api/src/main/java/org/keycloak/models/UserFederationMapperModel.java b/server-spi/src/main/java/org/keycloak/models/UserFederationMapperModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/UserFederationMapperModel.java rename to server-spi/src/main/java/org/keycloak/models/UserFederationMapperModel.java diff --git a/model/api/src/main/java/org/keycloak/models/UserFederationProvider.java b/server-spi/src/main/java/org/keycloak/models/UserFederationProvider.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/UserFederationProvider.java rename to server-spi/src/main/java/org/keycloak/models/UserFederationProvider.java diff --git a/model/api/src/main/java/org/keycloak/models/UserFederationProviderCreationEventImpl.java b/server-spi/src/main/java/org/keycloak/models/UserFederationProviderCreationEventImpl.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/UserFederationProviderCreationEventImpl.java rename to server-spi/src/main/java/org/keycloak/models/UserFederationProviderCreationEventImpl.java diff --git a/model/api/src/main/java/org/keycloak/models/UserFederationProviderFactory.java b/server-spi/src/main/java/org/keycloak/models/UserFederationProviderFactory.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/UserFederationProviderFactory.java rename to server-spi/src/main/java/org/keycloak/models/UserFederationProviderFactory.java diff --git a/model/api/src/main/java/org/keycloak/models/UserFederationProviderModel.java b/server-spi/src/main/java/org/keycloak/models/UserFederationProviderModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/UserFederationProviderModel.java rename to server-spi/src/main/java/org/keycloak/models/UserFederationProviderModel.java diff --git a/model/api/src/main/java/org/keycloak/models/UserFederationSpi.java b/server-spi/src/main/java/org/keycloak/models/UserFederationSpi.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/UserFederationSpi.java rename to server-spi/src/main/java/org/keycloak/models/UserFederationSpi.java diff --git a/model/api/src/main/java/org/keycloak/models/UserFederationSyncResult.java b/server-spi/src/main/java/org/keycloak/models/UserFederationSyncResult.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/UserFederationSyncResult.java rename to server-spi/src/main/java/org/keycloak/models/UserFederationSyncResult.java diff --git a/model/api/src/main/java/org/keycloak/models/UserModel.java b/server-spi/src/main/java/org/keycloak/models/UserModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/UserModel.java rename to server-spi/src/main/java/org/keycloak/models/UserModel.java diff --git a/model/api/src/main/java/org/keycloak/models/UserProvider.java b/server-spi/src/main/java/org/keycloak/models/UserProvider.java similarity index 99% rename from model/api/src/main/java/org/keycloak/models/UserProvider.java rename to server-spi/src/main/java/org/keycloak/models/UserProvider.java index 044a9385f0..042c3728ce 100755 --- a/model/api/src/main/java/org/keycloak/models/UserProvider.java +++ b/server-spi/src/main/java/org/keycloak/models/UserProvider.java @@ -2,7 +2,6 @@ package org.keycloak.models; import org.keycloak.provider.Provider; -import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/model/api/src/main/java/org/keycloak/models/UserProviderFactory.java b/server-spi/src/main/java/org/keycloak/models/UserProviderFactory.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/UserProviderFactory.java rename to server-spi/src/main/java/org/keycloak/models/UserProviderFactory.java diff --git a/model/api/src/main/java/org/keycloak/models/UserSessionModel.java b/server-spi/src/main/java/org/keycloak/models/UserSessionModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/UserSessionModel.java rename to server-spi/src/main/java/org/keycloak/models/UserSessionModel.java diff --git a/model/api/src/main/java/org/keycloak/models/UserSessionProvider.java b/server-spi/src/main/java/org/keycloak/models/UserSessionProvider.java similarity index 99% rename from model/api/src/main/java/org/keycloak/models/UserSessionProvider.java rename to server-spi/src/main/java/org/keycloak/models/UserSessionProvider.java index f2acf49115..8145bb2071 100755 --- a/model/api/src/main/java/org/keycloak/models/UserSessionProvider.java +++ b/server-spi/src/main/java/org/keycloak/models/UserSessionProvider.java @@ -2,7 +2,6 @@ package org.keycloak.models; import org.keycloak.provider.Provider; -import java.util.Collection; import java.util.List; /** diff --git a/model/api/src/main/java/org/keycloak/models/UserSessionProviderFactory.java b/server-spi/src/main/java/org/keycloak/models/UserSessionProviderFactory.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/UserSessionProviderFactory.java rename to server-spi/src/main/java/org/keycloak/models/UserSessionProviderFactory.java diff --git a/model/api/src/main/java/org/keycloak/models/UserSessionSpi.java b/server-spi/src/main/java/org/keycloak/models/UserSessionSpi.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/UserSessionSpi.java rename to server-spi/src/main/java/org/keycloak/models/UserSessionSpi.java diff --git a/model/api/src/main/java/org/keycloak/models/UserSpi.java b/server-spi/src/main/java/org/keycloak/models/UserSpi.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/UserSpi.java rename to server-spi/src/main/java/org/keycloak/models/UserSpi.java diff --git a/model/api/src/main/java/org/keycloak/models/UsernameLoginFailureModel.java b/server-spi/src/main/java/org/keycloak/models/UsernameLoginFailureModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/UsernameLoginFailureModel.java rename to server-spi/src/main/java/org/keycloak/models/UsernameLoginFailureModel.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/AbstractIdentifiableEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/AbstractIdentifiableEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/AbstractIdentifiableEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/AbstractIdentifiableEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/AuthenticationExecutionEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/AuthenticationExecutionEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/AuthenticationExecutionEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/AuthenticationExecutionEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/AuthenticationFlowEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/AuthenticationFlowEntity.java similarity index 98% rename from model/api/src/main/java/org/keycloak/models/entities/AuthenticationFlowEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/AuthenticationFlowEntity.java index a28df5d3f0..502dbce786 100755 --- a/model/api/src/main/java/org/keycloak/models/entities/AuthenticationFlowEntity.java +++ b/server-spi/src/main/java/org/keycloak/models/entities/AuthenticationFlowEntity.java @@ -1,7 +1,6 @@ package org.keycloak.models.entities; import java.util.ArrayList; -import java.util.Collection; import java.util.List; /** diff --git a/model/api/src/main/java/org/keycloak/models/entities/AuthenticatorConfigEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/AuthenticatorConfigEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/AuthenticatorConfigEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/AuthenticatorConfigEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/ClientEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/ClientEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/ClientEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/ClientEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/ClientIdentityProviderMappingEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/ClientIdentityProviderMappingEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/ClientIdentityProviderMappingEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/ClientIdentityProviderMappingEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/ClientTemplateEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/ClientTemplateEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/ClientTemplateEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/ClientTemplateEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/CredentialEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/CredentialEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/CredentialEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/CredentialEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/FederatedIdentityEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/FederatedIdentityEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/FederatedIdentityEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/FederatedIdentityEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/GroupEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/GroupEntity.java similarity index 95% rename from model/api/src/main/java/org/keycloak/models/entities/GroupEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/GroupEntity.java index 5e64643e57..b6cad72992 100755 --- a/model/api/src/main/java/org/keycloak/models/entities/GroupEntity.java +++ b/server-spi/src/main/java/org/keycloak/models/entities/GroupEntity.java @@ -1,9 +1,7 @@ package org.keycloak.models.entities; -import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Set; /** * @author Bill Burke/a> diff --git a/model/api/src/main/java/org/keycloak/models/entities/IdentityProviderEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/IdentityProviderEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/IdentityProviderEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/IdentityProviderEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/IdentityProviderMapperEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/IdentityProviderMapperEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/IdentityProviderMapperEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/IdentityProviderMapperEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/PersistentClientSessionEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/PersistentClientSessionEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/PersistentClientSessionEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/PersistentClientSessionEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/PersistentUserSessionEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/PersistentUserSessionEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/PersistentUserSessionEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/PersistentUserSessionEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/ProtocolMapperEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/ProtocolMapperEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/ProtocolMapperEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/ProtocolMapperEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/RealmEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/RealmEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/RealmEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/RealmEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/RequiredActionProviderEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/RequiredActionProviderEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/RequiredActionProviderEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/RequiredActionProviderEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/RequiredCredentialEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/RequiredCredentialEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/RequiredCredentialEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/RequiredCredentialEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/RoleEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/RoleEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/RoleEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/RoleEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/UserConsentEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/UserConsentEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/UserConsentEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/UserConsentEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/UserEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/UserEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/UserEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/UserEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/UserFederationMapperEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/UserFederationMapperEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/UserFederationMapperEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/UserFederationMapperEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/UserFederationProviderEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/UserFederationProviderEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/UserFederationProviderEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/UserFederationProviderEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/entities/UsernameLoginFailureEntity.java b/server-spi/src/main/java/org/keycloak/models/entities/UsernameLoginFailureEntity.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/entities/UsernameLoginFailureEntity.java rename to server-spi/src/main/java/org/keycloak/models/entities/UsernameLoginFailureEntity.java diff --git a/model/api/src/main/java/org/keycloak/models/session/DisabledUserSessionPersisterProvider.java b/server-spi/src/main/java/org/keycloak/models/session/DisabledUserSessionPersisterProvider.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/session/DisabledUserSessionPersisterProvider.java rename to server-spi/src/main/java/org/keycloak/models/session/DisabledUserSessionPersisterProvider.java diff --git a/model/api/src/main/java/org/keycloak/models/session/PersistentClientSessionAdapter.java b/server-spi/src/main/java/org/keycloak/models/session/PersistentClientSessionAdapter.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/session/PersistentClientSessionAdapter.java rename to server-spi/src/main/java/org/keycloak/models/session/PersistentClientSessionAdapter.java diff --git a/model/api/src/main/java/org/keycloak/models/session/PersistentClientSessionModel.java b/server-spi/src/main/java/org/keycloak/models/session/PersistentClientSessionModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/session/PersistentClientSessionModel.java rename to server-spi/src/main/java/org/keycloak/models/session/PersistentClientSessionModel.java diff --git a/model/api/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java b/server-spi/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java rename to server-spi/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java diff --git a/model/api/src/main/java/org/keycloak/models/session/PersistentUserSessionModel.java b/server-spi/src/main/java/org/keycloak/models/session/PersistentUserSessionModel.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/session/PersistentUserSessionModel.java rename to server-spi/src/main/java/org/keycloak/models/session/PersistentUserSessionModel.java diff --git a/model/api/src/main/java/org/keycloak/models/session/UserSessionPersisterProvider.java b/server-spi/src/main/java/org/keycloak/models/session/UserSessionPersisterProvider.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/session/UserSessionPersisterProvider.java rename to server-spi/src/main/java/org/keycloak/models/session/UserSessionPersisterProvider.java diff --git a/model/api/src/main/java/org/keycloak/models/session/UserSessionPersisterProviderFactory.java b/server-spi/src/main/java/org/keycloak/models/session/UserSessionPersisterProviderFactory.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/session/UserSessionPersisterProviderFactory.java rename to server-spi/src/main/java/org/keycloak/models/session/UserSessionPersisterProviderFactory.java diff --git a/model/api/src/main/java/org/keycloak/models/session/UserSessionPersisterSpi.java b/server-spi/src/main/java/org/keycloak/models/session/UserSessionPersisterSpi.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/session/UserSessionPersisterSpi.java rename to server-spi/src/main/java/org/keycloak/models/session/UserSessionPersisterSpi.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/Base32.java b/server-spi/src/main/java/org/keycloak/models/utils/Base32.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/Base32.java rename to server-spi/src/main/java/org/keycloak/models/utils/Base32.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/CredentialValidation.java b/server-spi/src/main/java/org/keycloak/models/utils/CredentialValidation.java similarity index 98% rename from model/api/src/main/java/org/keycloak/models/utils/CredentialValidation.java rename to server-spi/src/main/java/org/keycloak/models/utils/CredentialValidation.java index 6afc9ed2de..e974c63f4e 100755 --- a/model/api/src/main/java/org/keycloak/models/utils/CredentialValidation.java +++ b/server-spi/src/main/java/org/keycloak/models/utils/CredentialValidation.java @@ -4,7 +4,6 @@ import org.keycloak.hash.PasswordHashManager; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.JWSInputException; import org.keycloak.jose.jws.crypto.RSAProvider; -import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.OTPPolicy; import org.keycloak.models.PasswordPolicy; @@ -14,7 +13,6 @@ import org.keycloak.models.UserCredentialValueModel; import org.keycloak.models.UserModel; import org.keycloak.representations.PasswordToken; import org.keycloak.common.util.Time; -import org.keycloak.hash.PasswordHashProvider; import java.util.List; diff --git a/model/api/src/main/java/org/keycloak/models/utils/DefaultAuthenticationFlows.java b/server-spi/src/main/java/org/keycloak/models/utils/DefaultAuthenticationFlows.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/DefaultAuthenticationFlows.java rename to server-spi/src/main/java/org/keycloak/models/utils/DefaultAuthenticationFlows.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/DefaultRequiredActions.java b/server-spi/src/main/java/org/keycloak/models/utils/DefaultRequiredActions.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/DefaultRequiredActions.java rename to server-spi/src/main/java/org/keycloak/models/utils/DefaultRequiredActions.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/FormMessage.java b/server-spi/src/main/java/org/keycloak/models/utils/FormMessage.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/FormMessage.java rename to server-spi/src/main/java/org/keycloak/models/utils/FormMessage.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/HmacOTP.java b/server-spi/src/main/java/org/keycloak/models/utils/HmacOTP.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/HmacOTP.java rename to server-spi/src/main/java/org/keycloak/models/utils/HmacOTP.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java b/server-spi/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java similarity index 99% rename from model/api/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java rename to server-spi/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java index 6a77ac628c..3c71f724d4 100755 --- a/model/api/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java +++ b/server-spi/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java @@ -1,14 +1,12 @@ package org.keycloak.models.utils; import org.bouncycastle.openssl.PEMWriter; -import org.keycloak.common.util.Base64; import org.keycloak.common.util.Base64Url; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; import org.keycloak.models.GroupModel; -import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.KeycloakSessionTask; @@ -22,7 +20,6 @@ import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserFederationMapperModel; import org.keycloak.models.UserFederationProviderModel; import org.keycloak.models.UserModel; -import org.keycloak.representations.idm.AuthenticationExecutionRepresentation; import org.keycloak.representations.idm.CertificateRepresentation; import org.keycloak.common.util.CertificateUtils; import org.keycloak.common.util.PemUtils; @@ -41,7 +38,6 @@ import java.security.cert.X509Certificate; 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; diff --git a/model/api/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java b/server-spi/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java rename to server-spi/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/PostMigrationEvent.java b/server-spi/src/main/java/org/keycloak/models/utils/PostMigrationEvent.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/PostMigrationEvent.java rename to server-spi/src/main/java/org/keycloak/models/utils/PostMigrationEvent.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/RealmImporter.java b/server-spi/src/main/java/org/keycloak/models/utils/RealmImporter.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/RealmImporter.java rename to server-spi/src/main/java/org/keycloak/models/utils/RealmImporter.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/RealmInfoUtil.java b/server-spi/src/main/java/org/keycloak/models/utils/RealmInfoUtil.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/RealmInfoUtil.java rename to server-spi/src/main/java/org/keycloak/models/utils/RealmInfoUtil.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/RepresentationToModel.java b/server-spi/src/main/java/org/keycloak/models/utils/RepresentationToModel.java similarity index 99% rename from model/api/src/main/java/org/keycloak/models/utils/RepresentationToModel.java rename to server-spi/src/main/java/org/keycloak/models/utils/RepresentationToModel.java index 612daba51d..e4634bad14 100755 --- a/model/api/src/main/java/org/keycloak/models/utils/RepresentationToModel.java +++ b/server-spi/src/main/java/org/keycloak/models/utils/RepresentationToModel.java @@ -1,6 +1,5 @@ package org.keycloak.models.utils; -import org.keycloak.Config; import org.keycloak.hash.Pbkdf2PasswordHashProvider; import org.keycloak.models.ClientTemplateModel; import org.keycloak.models.Constants; diff --git a/model/api/src/main/java/org/keycloak/models/utils/SHAPasswordEncoder.java b/server-spi/src/main/java/org/keycloak/models/utils/SHAPasswordEncoder.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/SHAPasswordEncoder.java rename to server-spi/src/main/java/org/keycloak/models/utils/SHAPasswordEncoder.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/TimeBasedOTP.java b/server-spi/src/main/java/org/keycloak/models/utils/TimeBasedOTP.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/TimeBasedOTP.java rename to server-spi/src/main/java/org/keycloak/models/utils/TimeBasedOTP.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/UserModelDelegate.java b/server-spi/src/main/java/org/keycloak/models/utils/UserModelDelegate.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/UserModelDelegate.java rename to server-spi/src/main/java/org/keycloak/models/utils/UserModelDelegate.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/reflection/AnnotatedPropertyCriteria.java b/server-spi/src/main/java/org/keycloak/models/utils/reflection/AnnotatedPropertyCriteria.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/reflection/AnnotatedPropertyCriteria.java rename to server-spi/src/main/java/org/keycloak/models/utils/reflection/AnnotatedPropertyCriteria.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/reflection/MethodProperty.java b/server-spi/src/main/java/org/keycloak/models/utils/reflection/MethodProperty.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/reflection/MethodProperty.java rename to server-spi/src/main/java/org/keycloak/models/utils/reflection/MethodProperty.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/reflection/MethodPropertyImpl.java b/server-spi/src/main/java/org/keycloak/models/utils/reflection/MethodPropertyImpl.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/reflection/MethodPropertyImpl.java rename to server-spi/src/main/java/org/keycloak/models/utils/reflection/MethodPropertyImpl.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/reflection/NamedPropertyCriteria.java b/server-spi/src/main/java/org/keycloak/models/utils/reflection/NamedPropertyCriteria.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/reflection/NamedPropertyCriteria.java rename to server-spi/src/main/java/org/keycloak/models/utils/reflection/NamedPropertyCriteria.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/reflection/Properties.java b/server-spi/src/main/java/org/keycloak/models/utils/reflection/Properties.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/reflection/Properties.java rename to server-spi/src/main/java/org/keycloak/models/utils/reflection/Properties.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/reflection/Property.java b/server-spi/src/main/java/org/keycloak/models/utils/reflection/Property.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/reflection/Property.java rename to server-spi/src/main/java/org/keycloak/models/utils/reflection/Property.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/reflection/PropertyCriteria.java b/server-spi/src/main/java/org/keycloak/models/utils/reflection/PropertyCriteria.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/reflection/PropertyCriteria.java rename to server-spi/src/main/java/org/keycloak/models/utils/reflection/PropertyCriteria.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/reflection/PropertyQueries.java b/server-spi/src/main/java/org/keycloak/models/utils/reflection/PropertyQueries.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/reflection/PropertyQueries.java rename to server-spi/src/main/java/org/keycloak/models/utils/reflection/PropertyQueries.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/reflection/PropertyQuery.java b/server-spi/src/main/java/org/keycloak/models/utils/reflection/PropertyQuery.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/reflection/PropertyQuery.java rename to server-spi/src/main/java/org/keycloak/models/utils/reflection/PropertyQuery.java diff --git a/model/api/src/main/java/org/keycloak/models/utils/reflection/TypedPropertyCriteria.java b/server-spi/src/main/java/org/keycloak/models/utils/reflection/TypedPropertyCriteria.java similarity index 100% rename from model/api/src/main/java/org/keycloak/models/utils/reflection/TypedPropertyCriteria.java rename to server-spi/src/main/java/org/keycloak/models/utils/reflection/TypedPropertyCriteria.java diff --git a/model/api/src/main/java/org/keycloak/provider/ConfiguredProvider.java b/server-spi/src/main/java/org/keycloak/provider/ConfiguredProvider.java similarity index 100% rename from model/api/src/main/java/org/keycloak/provider/ConfiguredProvider.java rename to server-spi/src/main/java/org/keycloak/provider/ConfiguredProvider.java diff --git a/model/api/src/main/java/org/keycloak/provider/Provider.java b/server-spi/src/main/java/org/keycloak/provider/Provider.java similarity index 100% rename from model/api/src/main/java/org/keycloak/provider/Provider.java rename to server-spi/src/main/java/org/keycloak/provider/Provider.java diff --git a/model/api/src/main/java/org/keycloak/provider/ProviderConfigProperty.java b/server-spi/src/main/java/org/keycloak/provider/ProviderConfigProperty.java similarity index 100% rename from model/api/src/main/java/org/keycloak/provider/ProviderConfigProperty.java rename to server-spi/src/main/java/org/keycloak/provider/ProviderConfigProperty.java diff --git a/model/api/src/main/java/org/keycloak/provider/ProviderEvent.java b/server-spi/src/main/java/org/keycloak/provider/ProviderEvent.java similarity index 100% rename from model/api/src/main/java/org/keycloak/provider/ProviderEvent.java rename to server-spi/src/main/java/org/keycloak/provider/ProviderEvent.java diff --git a/model/api/src/main/java/org/keycloak/provider/ProviderEventListener.java b/server-spi/src/main/java/org/keycloak/provider/ProviderEventListener.java similarity index 100% rename from model/api/src/main/java/org/keycloak/provider/ProviderEventListener.java rename to server-spi/src/main/java/org/keycloak/provider/ProviderEventListener.java diff --git a/model/api/src/main/java/org/keycloak/provider/ProviderEventManager.java b/server-spi/src/main/java/org/keycloak/provider/ProviderEventManager.java similarity index 100% rename from model/api/src/main/java/org/keycloak/provider/ProviderEventManager.java rename to server-spi/src/main/java/org/keycloak/provider/ProviderEventManager.java diff --git a/model/api/src/main/java/org/keycloak/provider/ProviderFactory.java b/server-spi/src/main/java/org/keycloak/provider/ProviderFactory.java similarity index 100% rename from model/api/src/main/java/org/keycloak/provider/ProviderFactory.java rename to server-spi/src/main/java/org/keycloak/provider/ProviderFactory.java diff --git a/model/api/src/main/java/org/keycloak/provider/ProviderLoader.java b/server-spi/src/main/java/org/keycloak/provider/ProviderLoader.java similarity index 100% rename from model/api/src/main/java/org/keycloak/provider/ProviderLoader.java rename to server-spi/src/main/java/org/keycloak/provider/ProviderLoader.java diff --git a/model/api/src/main/java/org/keycloak/provider/ProviderLoaderFactory.java b/server-spi/src/main/java/org/keycloak/provider/ProviderLoaderFactory.java similarity index 100% rename from model/api/src/main/java/org/keycloak/provider/ProviderLoaderFactory.java rename to server-spi/src/main/java/org/keycloak/provider/ProviderLoaderFactory.java diff --git a/model/api/src/main/java/org/keycloak/provider/ServerInfoAwareProviderFactory.java b/server-spi/src/main/java/org/keycloak/provider/ServerInfoAwareProviderFactory.java similarity index 100% rename from model/api/src/main/java/org/keycloak/provider/ServerInfoAwareProviderFactory.java rename to server-spi/src/main/java/org/keycloak/provider/ServerInfoAwareProviderFactory.java diff --git a/model/api/src/main/java/org/keycloak/provider/Spi.java b/server-spi/src/main/java/org/keycloak/provider/Spi.java similarity index 100% rename from model/api/src/main/java/org/keycloak/provider/Spi.java rename to server-spi/src/main/java/org/keycloak/provider/Spi.java diff --git a/model/api/src/main/resources/META-INF/services/org.keycloak.hash.PasswordHashProviderFactory b/server-spi/src/main/resources/META-INF/services/org.keycloak.hash.PasswordHashProviderFactory similarity index 100% rename from model/api/src/main/resources/META-INF/services/org.keycloak.hash.PasswordHashProviderFactory rename to server-spi/src/main/resources/META-INF/services/org.keycloak.hash.PasswordHashProviderFactory diff --git a/model/api/src/main/resources/META-INF/services/org.keycloak.models.session.UserSessionPersisterProviderFactory b/server-spi/src/main/resources/META-INF/services/org.keycloak.models.session.UserSessionPersisterProviderFactory similarity index 100% rename from model/api/src/main/resources/META-INF/services/org.keycloak.models.session.UserSessionPersisterProviderFactory rename to server-spi/src/main/resources/META-INF/services/org.keycloak.models.session.UserSessionPersisterProviderFactory diff --git a/model/api/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi similarity index 100% rename from model/api/src/main/resources/META-INF/services/org.keycloak.provider.Spi rename to server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi diff --git a/model/api/src/test/java/org/keycloak/models/HmacTest.java b/server-spi/src/test/java/org/keycloak/models/HmacTest.java similarity index 72% rename from model/api/src/test/java/org/keycloak/models/HmacTest.java rename to server-spi/src/test/java/org/keycloak/models/HmacTest.java index 0cda696e7e..d313f222ad 100755 --- a/model/api/src/test/java/org/keycloak/models/HmacTest.java +++ b/server-spi/src/test/java/org/keycloak/models/HmacTest.java @@ -5,15 +5,6 @@ import org.junit.Test; import org.keycloak.models.utils.Base32; import org.keycloak.models.utils.HmacOTP; -import javax.crypto.Mac; -import javax.crypto.spec.SecretKeySpec; -import java.io.BufferedReader; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.util.Scanner; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/api/src/test/java/org/keycloak/models/PasswordPolicyTest.java b/server-spi/src/test/java/org/keycloak/models/PasswordPolicyTest.java similarity index 100% rename from model/api/src/test/java/org/keycloak/models/PasswordPolicyTest.java rename to server-spi/src/test/java/org/keycloak/models/PasswordPolicyTest.java diff --git a/services/pom.xml b/services/pom.xml index bcca1b88bd..408366e9af 100755 --- a/services/pom.xml +++ b/services/pom.xml @@ -60,7 +60,8 @@ org.keycloak - keycloak-model-api + keycloak-server-spi + provided org.keycloak diff --git a/services/src/main/java/org/keycloak/authentication/AuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/AuthenticatorFactory.java index 2d344063ea..b1deac43c5 100755 --- a/services/src/main/java/org/keycloak/authentication/AuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/AuthenticatorFactory.java @@ -1,8 +1,5 @@ package org.keycloak.authentication; -import org.keycloak.models.AuthenticationExecutionModel; -import org.keycloak.models.AuthenticatorConfigModel; -import org.keycloak.provider.ConfiguredProvider; import org.keycloak.provider.ProviderFactory; /** diff --git a/services/src/main/java/org/keycloak/authentication/AuthenticatorSpi.java b/services/src/main/java/org/keycloak/authentication/AuthenticatorSpi.java index 56cfeea70e..8b7e4a54e8 100755 --- a/services/src/main/java/org/keycloak/authentication/AuthenticatorSpi.java +++ b/services/src/main/java/org/keycloak/authentication/AuthenticatorSpi.java @@ -1,6 +1,5 @@ package org.keycloak.authentication; -import org.keycloak.protocol.ProtocolMapper; import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderFactory; import org.keycloak.provider.Spi; diff --git a/services/src/main/java/org/keycloak/authentication/ClientAuthenticationFlow.java b/services/src/main/java/org/keycloak/authentication/ClientAuthenticationFlow.java old mode 100644 new mode 100755 index 225491f314..2380c72302 --- a/services/src/main/java/org/keycloak/authentication/ClientAuthenticationFlow.java +++ b/services/src/main/java/org/keycloak/authentication/ClientAuthenticationFlow.java @@ -2,8 +2,6 @@ package org.keycloak.authentication; import java.util.ArrayList; import java.util.Arrays; -import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import javax.ws.rs.core.Response; diff --git a/services/src/main/java/org/keycloak/authentication/ClientAuthenticator.java b/services/src/main/java/org/keycloak/authentication/ClientAuthenticator.java old mode 100644 new mode 100755 index 9e26b239b1..0a57aaf17e --- a/services/src/main/java/org/keycloak/authentication/ClientAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/ClientAuthenticator.java @@ -1,8 +1,5 @@ package org.keycloak.authentication; -import org.keycloak.models.ClientModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; import org.keycloak.provider.Provider; /** diff --git a/services/src/main/java/org/keycloak/authentication/DefaultAuthenticationFlow.java b/services/src/main/java/org/keycloak/authentication/DefaultAuthenticationFlow.java index 6cc22f2ccd..0933c87fe0 100755 --- a/services/src/main/java/org/keycloak/authentication/DefaultAuthenticationFlow.java +++ b/services/src/main/java/org/keycloak/authentication/DefaultAuthenticationFlow.java @@ -10,8 +10,6 @@ import javax.ws.rs.core.Response; import java.util.Iterator; import java.util.List; -import static org.keycloak.authentication.FlowStatus.SUCCESS; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/authentication/FormAuthenticator.java b/services/src/main/java/org/keycloak/authentication/FormAuthenticator.java index f31dd3013e..a900668aca 100755 --- a/services/src/main/java/org/keycloak/authentication/FormAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/FormAuthenticator.java @@ -1,12 +1,9 @@ package org.keycloak.authentication; import org.keycloak.login.LoginFormsProvider; -import org.keycloak.models.utils.FormMessage; import org.keycloak.provider.Provider; -import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; -import java.util.List; /** * This class is responsible for rendering a form. The way it works is that each FormAction that is a child of this diff --git a/services/src/main/java/org/keycloak/authentication/RequiredActionProvider.java b/services/src/main/java/org/keycloak/authentication/RequiredActionProvider.java index 94a9f2ab15..b4b8ec4b21 100755 --- a/services/src/main/java/org/keycloak/authentication/RequiredActionProvider.java +++ b/services/src/main/java/org/keycloak/authentication/RequiredActionProvider.java @@ -2,8 +2,6 @@ package org.keycloak.authentication; import org.keycloak.provider.Provider; -import javax.ws.rs.core.Response; - /** * RequiredAction provider. Required actions are one-time actions that a user must perform before they are logged in. * diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/util/SerializedBrokeredIdentityContext.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/util/SerializedBrokeredIdentityContext.java old mode 100644 new mode 100755 index 65a59776b5..23efa3068f --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/util/SerializedBrokeredIdentityContext.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/util/SerializedBrokeredIdentityContext.java @@ -2,13 +2,11 @@ package org.keycloak.authentication.authenticators.broker.util; import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import com.fasterxml.jackson.annotation.JsonIgnore; -import org.keycloak.authentication.authenticators.broker.AbstractIdpAuthenticator; import org.keycloak.authentication.requiredactions.util.UpdateProfileContext; import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.broker.provider.IdentityProvider; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernamePasswordForm.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernamePasswordForm.java index 74636384bc..ba3fdd3a63 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernamePasswordForm.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernamePasswordForm.java @@ -5,12 +5,10 @@ import org.jboss.resteasy.specimpl.MultivaluedMapImpl; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.authentication.Authenticator; -import org.keycloak.events.Errors; import org.keycloak.login.LoginFormsProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; -import org.keycloak.protocol.LoginProtocol; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.services.managers.AuthenticationManager; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientAuthUtil.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientAuthUtil.java old mode 100644 new mode 100755 index dc232e3584..f798887eb5 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientAuthUtil.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientAuthUtil.java @@ -3,16 +3,10 @@ package org.keycloak.authentication.authenticators.client; import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import org.keycloak.OAuth2Constants; -import org.keycloak.authentication.AuthenticationFlowError; -import org.keycloak.authentication.ClientAuthenticationFlowContext; -import org.keycloak.models.ClientModel; -import org.keycloak.util.BasicAuthHelper; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetOTP.java b/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetOTP.java index 9ee834c034..1fdcacbd1e 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetOTP.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetOTP.java @@ -1,9 +1,6 @@ package org.keycloak.authentication.authenticators.resetcred; import org.keycloak.authentication.AuthenticationFlowContext; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserModel; /** diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetPassword.java b/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetPassword.java index 468f4a0da1..b46c8f12f1 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetPassword.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetPassword.java @@ -1,18 +1,8 @@ package org.keycloak.authentication.authenticators.resetcred; -import org.keycloak.Config; import org.keycloak.authentication.AuthenticationFlowContext; -import org.keycloak.authentication.Authenticator; -import org.keycloak.authentication.AuthenticatorFactory; -import org.keycloak.models.AuthenticationExecutionModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.RealmModel; import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserModel; -import org.keycloak.provider.ProviderConfigProperty; - -import java.util.List; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/authentication/forms/RegistrationRecaptcha.java b/services/src/main/java/org/keycloak/authentication/forms/RegistrationRecaptcha.java index eb10250946..a640b70ce4 100755 --- a/services/src/main/java/org/keycloak/authentication/forms/RegistrationRecaptcha.java +++ b/services/src/main/java/org/keycloak/authentication/forms/RegistrationRecaptcha.java @@ -23,7 +23,6 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.utils.FormMessage; -import org.keycloak.protocol.oidc.mappers.OIDCAttributeMapperHelper; import org.keycloak.provider.ConfiguredProvider; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.services.messages.Messages; diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/TermsAndConditions.java b/services/src/main/java/org/keycloak/authentication/requiredactions/TermsAndConditions.java index b34f040e31..0a277e5aab 100755 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/TermsAndConditions.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/TermsAndConditions.java @@ -1,8 +1,6 @@ package org.keycloak.authentication.requiredactions; -import java.text.SimpleDateFormat; import java.util.Arrays; -import java.util.Date; import org.keycloak.Config; import org.keycloak.authentication.RequiredActionContext; diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateProfile.java b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateProfile.java index 107f7cc07d..dace75b3e3 100755 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateProfile.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateProfile.java @@ -8,15 +8,11 @@ import org.keycloak.authentication.RequiredActionProvider; import org.keycloak.events.Details; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; -import org.keycloak.login.LoginFormsProvider; -import org.keycloak.models.ClientSessionModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; -import org.keycloak.models.UserSessionModel; import org.keycloak.models.utils.FormMessage; -import org.keycloak.services.managers.ClientSessionCode; import org.keycloak.services.messages.Messages; import org.keycloak.services.resources.AttributeFormDataProcessor; import org.keycloak.services.validation.Validation; diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateTotp.java b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateTotp.java index 6c7415492a..c6186029bf 100755 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateTotp.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateTotp.java @@ -7,17 +7,11 @@ import org.keycloak.authentication.RequiredActionFactory; import org.keycloak.authentication.RequiredActionProvider; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; -import org.keycloak.login.LoginFormsProvider; -import org.keycloak.models.ClientSessionModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.RequiredCredentialModel; import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserModel; -import org.keycloak.models.UserSessionModel; import org.keycloak.models.utils.CredentialValidation; -import org.keycloak.representations.idm.CredentialRepresentation; -import org.keycloak.services.managers.ClientSessionCode; import org.keycloak.services.messages.Messages; import org.keycloak.services.validation.Validation; diff --git a/services/src/main/java/org/keycloak/exportimport/KeycloakClientDescriptionConverter.java b/services/src/main/java/org/keycloak/exportimport/KeycloakClientDescriptionConverter.java old mode 100644 new mode 100755 index c793fe0b29..49d9e58ecf --- a/services/src/main/java/org/keycloak/exportimport/KeycloakClientDescriptionConverter.java +++ b/services/src/main/java/org/keycloak/exportimport/KeycloakClientDescriptionConverter.java @@ -1,11 +1,8 @@ package org.keycloak.exportimport; import org.keycloak.Config; -import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.RealmModel; -import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.util.JsonSerialization; diff --git a/services/src/main/java/org/keycloak/partialimport/ClientsPartialImport.java b/services/src/main/java/org/keycloak/partialimport/ClientsPartialImport.java old mode 100644 new mode 100755 index 7f4597c901..11f65a1fb9 --- a/services/src/main/java/org/keycloak/partialimport/ClientsPartialImport.java +++ b/services/src/main/java/org/keycloak/partialimport/ClientsPartialImport.java @@ -26,8 +26,6 @@ import org.keycloak.models.utils.RepresentationToModel; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.PartialImportRepresentation; import org.keycloak.representations.idm.ProtocolMapperRepresentation; -import org.keycloak.services.managers.ClientManager; -import org.keycloak.services.managers.RealmManager; /** * PartialImport handler for Clients. diff --git a/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java b/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java index 68a4aaf63f..0051434477 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java @@ -43,7 +43,6 @@ import org.keycloak.common.util.Time; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.io.IOException; import java.util.Arrays; import java.util.Collection; import java.util.Collections; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java old mode 100644 new mode 100755 index 3340c359d9..e1f3ff2a54 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java @@ -1,6 +1,5 @@ package org.keycloak.protocol.oidc.endpoints; -import org.jboss.resteasy.spi.BadRequestException; import org.jboss.resteasy.spi.NotFoundException; import org.keycloak.Config; import org.keycloak.models.ClientModel; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/FullNameMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/FullNameMapper.java index dc7480e7c4..a460c6aec1 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/FullNameMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/FullNameMapper.java @@ -5,7 +5,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; -import org.keycloak.protocol.ProtocolMapperUtils; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.AccessToken; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/GroupMembershipMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/GroupMembershipMapper.java index 848a8e83a3..634a9ba9c8 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/GroupMembershipMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/GroupMembershipMapper.java @@ -4,11 +4,8 @@ import org.keycloak.models.ClientSessionModel; import org.keycloak.models.GroupModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; -import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.ModelToRepresentation; -import org.keycloak.protocol.ProtocolMapperUtils; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.AccessToken; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedClaim.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedClaim.java index e95131207f..892a909da2 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedClaim.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedClaim.java @@ -3,10 +3,7 @@ package org.keycloak.protocol.oidc.mappers; import org.keycloak.models.ClientSessionModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; -import org.keycloak.protocol.ProtocolMapper; -import org.keycloak.protocol.ProtocolMapperUtils; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.AccessToken; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedRole.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedRole.java index a839e31393..a1daadce7a 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedRole.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedRole.java @@ -5,7 +5,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserSessionModel; import org.keycloak.models.utils.KeycloakModelUtils; -import org.keycloak.protocol.ProtocolMapperUtils; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.AccessToken; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCIDTokenMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCIDTokenMapper.java index 858cfeceda..430b875bb9 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCIDTokenMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCIDTokenMapper.java @@ -4,7 +4,6 @@ import org.keycloak.models.ClientSessionModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserSessionModel; -import org.keycloak.representations.AccessToken; import org.keycloak.representations.IDToken; /** diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/RoleNameMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/RoleNameMapper.java index 3634095376..644784ac77 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/RoleNameMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/RoleNameMapper.java @@ -3,14 +3,11 @@ package org.keycloak.protocol.oidc.mappers; import org.keycloak.models.ClientSessionModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; import org.keycloak.models.utils.KeycloakModelUtils; -import org.keycloak.protocol.ProtocolMapperUtils; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.AccessToken; -import org.keycloak.representations.IDToken; import java.util.ArrayList; import java.util.HashMap; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserAttributeMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserAttributeMapper.java index 3e96692f59..5f48cc828c 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserAttributeMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserAttributeMapper.java @@ -1,6 +1,5 @@ package org.keycloak.protocol.oidc.mappers; -import org.jboss.logging.Logger; import org.keycloak.models.ClientSessionModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; diff --git a/services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java b/services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java index de996c3c16..26f52a2966 100755 --- a/services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java +++ b/services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java @@ -1,8 +1,6 @@ package org.keycloak.services; import org.jboss.logging.Logger; -import org.jboss.resteasy.spi.HttpRequest; -import org.jboss.resteasy.spi.ResteasyProviderFactory; import org.keycloak.models.KeycloakContext; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; @@ -16,8 +14,6 @@ import org.keycloak.models.cache.CacheUserProvider; import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderFactory; -import javax.ws.rs.core.UriInfo; - import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; diff --git a/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java b/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java index d011089113..0c95a37ce1 100755 --- a/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java @@ -11,7 +11,6 @@ import org.keycloak.models.utils.RepresentationToModel; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.services.ErrorResponseException; import org.keycloak.services.ForbiddenException; -import org.keycloak.services.managers.ClientManager; import javax.ws.rs.core.Response; diff --git a/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationTokenUtils.java b/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationTokenUtils.java old mode 100644 new mode 100755 index 4d54d5fa21..b28029ff57 --- a/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationTokenUtils.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationTokenUtils.java @@ -16,7 +16,6 @@ import org.keycloak.services.Urls; import org.keycloak.util.TokenUtil; import javax.ws.rs.core.UriInfo; -import java.io.IOException; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/clientregistration/DefaultClientRegistrationProvider.java b/services/src/main/java/org/keycloak/services/clientregistration/DefaultClientRegistrationProvider.java old mode 100644 new mode 100755 index 126d00af49..a530d307cd --- a/services/src/main/java/org/keycloak/services/clientregistration/DefaultClientRegistrationProvider.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/DefaultClientRegistrationProvider.java @@ -1,11 +1,7 @@ package org.keycloak.services.clientregistration; import org.keycloak.events.EventBuilder; -import org.keycloak.events.EventType; -import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.utils.ModelToRepresentation; -import org.keycloak.models.utils.RepresentationToModel; import org.keycloak.representations.idm.ClientRepresentation; import javax.ws.rs.*; diff --git a/services/src/main/java/org/keycloak/services/clientregistration/oidc/OIDCClientRegistrationProvider.java b/services/src/main/java/org/keycloak/services/clientregistration/oidc/OIDCClientRegistrationProvider.java old mode 100644 new mode 100755 index 82b8825eb9..4ab168ebcf --- a/services/src/main/java/org/keycloak/services/clientregistration/oidc/OIDCClientRegistrationProvider.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/oidc/OIDCClientRegistrationProvider.java @@ -4,7 +4,6 @@ import org.jboss.logging.Logger; import org.keycloak.common.util.Time; import org.keycloak.events.EventBuilder; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.oidc.OIDCClientRepresentation; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.services.ErrorResponseException; diff --git a/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java b/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java index 5d045e4518..4943d24c4d 100755 --- a/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java +++ b/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java @@ -37,7 +37,6 @@ import org.keycloak.models.*; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.protocol.LoginProtocol; import org.keycloak.protocol.LoginProtocol.Error; -import org.keycloak.protocol.RestartLoginCookie; import org.keycloak.protocol.oidc.TokenManager; import org.keycloak.representations.AccessToken; import org.keycloak.services.Urls; diff --git a/services/src/main/java/org/keycloak/services/managers/ClientManager.java b/services/src/main/java/org/keycloak/services/managers/ClientManager.java index af340c4b3f..21bb5692ba 100755 --- a/services/src/main/java/org/keycloak/services/managers/ClientManager.java +++ b/services/src/main/java/org/keycloak/services/managers/ClientManager.java @@ -13,7 +13,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionProvider; import org.keycloak.models.session.UserSessionPersisterProvider; -import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.RepresentationToModel; import org.keycloak.protocol.LoginProtocol; import org.keycloak.protocol.LoginProtocolFactory; diff --git a/services/src/main/java/org/keycloak/services/migration/DefaultMigrationProvider.java b/services/src/main/java/org/keycloak/services/migration/DefaultMigrationProvider.java index e1e6f23049..a31fce118f 100755 --- a/services/src/main/java/org/keycloak/services/migration/DefaultMigrationProvider.java +++ b/services/src/main/java/org/keycloak/services/migration/DefaultMigrationProvider.java @@ -1,7 +1,6 @@ package org.keycloak.services.migration; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/services/resources/AbstractSecuredLocalService.java b/services/src/main/java/org/keycloak/services/resources/AbstractSecuredLocalService.java index c4e2bff056..956b1e12f9 100755 --- a/services/src/main/java/org/keycloak/services/resources/AbstractSecuredLocalService.java +++ b/services/src/main/java/org/keycloak/services/resources/AbstractSecuredLocalService.java @@ -6,7 +6,6 @@ import org.jboss.resteasy.spi.HttpRequest; import org.keycloak.AbstractOAuthClient; import org.keycloak.common.ClientConnection; import org.keycloak.OAuth2Constants; -import org.keycloak.common.util.Base64Url; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -32,7 +31,6 @@ import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; import java.net.URI; import java.util.Set; -import java.util.UUID; /** * Helper class for securing local services. Provides login basics as well as CSRF check basics diff --git a/services/src/main/java/org/keycloak/services/resources/RealmsResource.java b/services/src/main/java/org/keycloak/services/resources/RealmsResource.java index 7e13bf97de..f84b181ea5 100755 --- a/services/src/main/java/org/keycloak/services/resources/RealmsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/RealmsResource.java @@ -3,7 +3,6 @@ package org.keycloak.services.resources; import org.jboss.logging.Logger; import org.jboss.resteasy.spi.NotFoundException; import org.jboss.resteasy.spi.ResteasyProviderFactory; -import org.keycloak.Config; import org.keycloak.common.ClientConnection; import org.keycloak.events.EventBuilder; import org.keycloak.models.ClientModel; diff --git a/services/src/main/java/org/keycloak/services/resources/ThemeResource.java b/services/src/main/java/org/keycloak/services/resources/ThemeResource.java index 092505ffb3..c9b3c6c185 100755 --- a/services/src/main/java/org/keycloak/services/resources/ThemeResource.java +++ b/services/src/main/java/org/keycloak/services/resources/ThemeResource.java @@ -1,7 +1,6 @@ package org.keycloak.services.resources; import org.jboss.logging.Logger; -import org.keycloak.Config; import org.keycloak.common.Version; import org.keycloak.freemarker.Theme; import org.keycloak.freemarker.ThemeProvider; @@ -12,7 +11,6 @@ import org.keycloak.services.util.CacheControlUtil; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; -import javax.ws.rs.core.CacheControl; import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; import java.io.InputStream; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java b/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java index 1ac5dbab8f..4b9a65c631 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java @@ -32,8 +32,6 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; -import java.io.IOException; - /** * Root resource for admin console and admin REST API * diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java index 8f6898c1bd..9f5188c5e0 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java @@ -8,7 +8,6 @@ import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleMapperModel; import org.keycloak.models.RoleModel; -import org.keycloak.models.UserModel; import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.representations.idm.RoleRepresentation; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientTemplateResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientTemplateResource.java index 53cc76b354..c67c04d3f2 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientTemplateResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientTemplateResource.java @@ -2,58 +2,28 @@ package org.keycloak.services.resources.admin; import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; -import org.jboss.resteasy.spi.BadRequestException; -import org.jboss.resteasy.spi.NotFoundException; import org.jboss.resteasy.spi.ResteasyProviderFactory; -import org.keycloak.common.util.Time; import org.keycloak.events.admin.OperationType; -import org.keycloak.models.ClientModel; -import org.keycloak.models.ClientSessionModel; import org.keycloak.models.ClientTemplateModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ModelDuplicateException; import org.keycloak.models.RealmModel; -import org.keycloak.models.UserCredentialModel; -import org.keycloak.models.UserModel; -import org.keycloak.models.UserSessionModel; -import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.models.utils.RepresentationToModel; -import org.keycloak.representations.adapters.action.GlobalRequestResult; -import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ClientTemplateRepresentation; -import org.keycloak.representations.idm.CredentialRepresentation; -import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.representations.idm.UserSessionRepresentation; import org.keycloak.services.ErrorResponse; -import org.keycloak.services.clientregistration.ClientRegistrationTokenUtils; -import org.keycloak.services.managers.ClientManager; -import org.keycloak.services.managers.RealmManager; -import org.keycloak.services.managers.ResourceAdminManager; import org.keycloak.services.resources.KeycloakApplication; -import org.keycloak.util.JsonSerialization; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; -import javax.ws.rs.POST; import javax.ws.rs.PUT; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import static java.lang.Boolean.TRUE; /** diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientTemplatesResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientTemplatesResource.java index c52fb1d2b4..e3c6387b41 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientTemplatesResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientTemplatesResource.java @@ -5,14 +5,12 @@ import org.jboss.resteasy.annotations.cache.NoCache; import org.jboss.resteasy.spi.NotFoundException; import org.jboss.resteasy.spi.ResteasyProviderFactory; import org.keycloak.events.admin.OperationType; -import org.keycloak.models.ClientModel; import org.keycloak.models.ClientTemplateModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ModelDuplicateException; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.models.utils.RepresentationToModel; -import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ClientTemplateRepresentation; import org.keycloak.services.ErrorResponse; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java index c6127fd67d..8b5decd4b3 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java @@ -10,7 +10,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.ModelDuplicateException; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.ModelToRepresentation; -import org.keycloak.models.utils.RepresentationToModel; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.managers.ClientManager; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java b/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java index 668057ebcf..4fe413045a 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java @@ -18,17 +18,14 @@ import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.PUT; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; import java.net.URI; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java index 6e3709da2f..67e4970b14 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java @@ -7,30 +7,21 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory; import org.keycloak.models.GroupModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; -import org.keycloak.models.UserModel; import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.representations.idm.GroupRepresentation; -import org.keycloak.representations.idm.UserRepresentation; import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.POST; -import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import java.net.URI; -import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Map; -import java.util.Set; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java index a115fc5349..b966a17618 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java @@ -4,7 +4,6 @@ import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; import org.jboss.resteasy.spi.NotFoundException; import org.keycloak.events.admin.OperationType; -import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ModelDuplicateException; import org.keycloak.models.ProtocolMapperContainerModel; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java index 1cece17fc0..a5c050d907 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java @@ -34,7 +34,6 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.GroupRepresentation; import org.keycloak.representations.idm.RealmEventsConfigRepresentation; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.services.clientregistration.ClientRegistrationException; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.managers.LDAPConnectionTestManager; import org.keycloak.services.managers.RealmManager; diff --git a/services/src/main/java/org/keycloak/services/util/LocaleHelper.java b/services/src/main/java/org/keycloak/services/util/LocaleHelper.java old mode 100644 new mode 100755 index eeefc8106e..672bf92d26 --- a/services/src/main/java/org/keycloak/services/util/LocaleHelper.java +++ b/services/src/main/java/org/keycloak/services/util/LocaleHelper.java @@ -16,13 +16,10 @@ */ package org.keycloak.services.util; -import org.jboss.resteasy.spi.HttpResponse; -import org.jboss.resteasy.spi.ResteasyProviderFactory; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.services.managers.AuthenticationManager; -import org.keycloak.common.util.ServerCookie; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.UriInfo; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java index 517f6c3d96..4725d2f881 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java @@ -10,7 +10,6 @@ import org.junit.runners.model.Statement; import org.keycloak.Config; import org.keycloak.OAuth2Constants; import org.keycloak.authentication.authenticators.client.ClientIdAndSecretAuthenticator; -import org.keycloak.common.constants.ServiceAccountConstants; import org.keycloak.events.admin.AdminEvent; import org.keycloak.events.Details; import org.keycloak.events.Event; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java index d02c2559cc..0ec2603c3b 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java @@ -28,7 +28,6 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.keycloak.events.Details; -import org.keycloak.events.Errors; import org.keycloak.events.Event; import org.keycloak.events.EventType; import org.keycloak.migration.MigrationModel; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/actions/TermsAndConditionsTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/actions/TermsAndConditionsTest.java index b1cf9819cb..32a224f8a8 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/actions/TermsAndConditionsTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/actions/TermsAndConditionsTest.java @@ -38,7 +38,6 @@ import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.LoginPage; -import org.keycloak.testsuite.pages.LoginUpdateProfilePage; import org.keycloak.testsuite.pages.TermsAndConditionsPage; import org.keycloak.testsuite.rule.KeycloakRule; import org.keycloak.testsuite.rule.WebResource; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenancyTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenancyTest.java index 7c957966f4..fe91e1efc3 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenancyTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenancyTest.java @@ -26,7 +26,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.protocol.oidc.OIDCLoginProtocolService; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.managers.RealmManager; -import org.keycloak.testsuite.federation.KerberosCredDelegServlet; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.rule.AbstractKeycloakRule; import org.keycloak.testsuite.rule.WebResource; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/RelativeUriAdapterTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/RelativeUriAdapterTest.java index eaebc821eb..b10ae39b40 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/RelativeUriAdapterTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/RelativeUriAdapterTest.java @@ -27,20 +27,12 @@ import org.junit.Rule; import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.Keycloak; -import org.keycloak.models.ClientModel; -import org.keycloak.models.ClientSessionModel; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; -import org.keycloak.models.UserModel; -import org.keycloak.models.UserSessionModel; -import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.OIDCLoginProtocolService; -import org.keycloak.protocol.oidc.TokenManager; -import org.keycloak.representations.AccessToken; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.managers.RealmManager; -import org.keycloak.services.resources.admin.AdminRoot; import org.keycloak.testsuite.OAuthClient; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.rule.AbstractKeycloakRule; @@ -49,11 +41,6 @@ import org.keycloak.testsuite.rule.WebRule; import org.keycloak.testsuite.KeycloakServer; import org.openqa.selenium.WebDriver; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.UriBuilder; import java.net.URL; import java.security.PublicKey; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/AbstractClientTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/AbstractClientTest.java index 52d0bf157f..480c6d01d8 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/AbstractClientTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/AbstractClientTest.java @@ -7,14 +7,11 @@ import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.models.Constants; import org.keycloak.models.RealmModel; -import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.rule.KeycloakRule; -import org.keycloak.testsuite.rule.WebResource; -import org.openqa.selenium.WebDriver; import java.util.*; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/ClientTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/ClientTest.java index 31f88bcf71..ca02953b5d 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/ClientTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/ClientTest.java @@ -14,8 +14,6 @@ import org.keycloak.testsuite.rule.WebRule; import org.openqa.selenium.WebDriver; import javax.ws.rs.NotFoundException; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response; import java.util.HashSet; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/ImpersonationTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/ImpersonationTest.java index 263e4e2011..b6210ef1c8 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/ImpersonationTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/ImpersonationTest.java @@ -52,7 +52,6 @@ import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.ClientRequestContext; import javax.ws.rs.client.ClientRequestFilter; import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/UserTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/UserTest.java index cae756eb9e..4990f58275 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/UserTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/UserTest.java @@ -1,34 +1,24 @@ package org.keycloak.testsuite.admin; import org.junit.Assert; -import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.admin.client.resource.UserResource; -import org.keycloak.events.Details; -import org.keycloak.events.EventType; -import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; -import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.idm.*; -import org.keycloak.services.managers.RealmManager; import org.keycloak.services.resources.RealmsResource; import org.keycloak.testsuite.Constants; import org.keycloak.testsuite.actions.RequiredActionEmailVerificationTest; import org.keycloak.testsuite.forms.ResetPasswordTest; import org.keycloak.testsuite.pages.*; import org.keycloak.testsuite.rule.GreenMailRule; -import org.keycloak.testsuite.rule.KeycloakRule; import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; import org.openqa.selenium.WebDriver; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; -import javax.ws.rs.BadRequestException; import javax.ws.rs.ClientErrorException; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java old mode 100644 new mode 100755 index 16ad0e32c9..bc47673078 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java @@ -10,16 +10,13 @@ import javax.mail.internet.MimeMessage; import org.junit.Assert; import org.junit.Test; -import org.keycloak.authentication.authenticators.broker.IdpCreateUserIfUniqueAuthenticator; import org.keycloak.authentication.authenticators.broker.IdpCreateUserIfUniqueAuthenticatorFactory; import org.keycloak.authentication.authenticators.broker.IdpEmailVerificationAuthenticatorFactory; -import org.keycloak.authentication.authenticators.broker.IdpReviewProfileAuthenticatorFactory; import org.keycloak.common.util.ObjectUtil; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.AuthenticatorConfigModel; import org.keycloak.models.FederatedIdentityModel; -import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.utils.DefaultAuthenticationFlows; @@ -27,7 +24,6 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.pages.IdpConfirmLinkPage; import org.keycloak.testsuite.pages.IdpLinkEmailPage; -import org.keycloak.testsuite.pages.LoginPasswordResetPage; import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; import org.keycloak.testsuite.pages.LoginUpdateProfileEditUsernameAllowedPage; import org.keycloak.testsuite.rule.KeycloakRule; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderTest.java index 1c3e043ca7..457b5aa136 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderTest.java @@ -22,24 +22,17 @@ import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; -import org.junit.Test; import org.keycloak.authentication.authenticators.broker.IdpReviewProfileAuthenticatorFactory; import org.keycloak.models.AuthenticatorConfigModel; -import org.keycloak.models.ClientModel; -import org.keycloak.models.Constants; import org.keycloak.models.FederatedIdentityModel; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionTask; import org.keycloak.models.RealmModel; -import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; -import org.keycloak.models.UserModel.RequiredAction; import org.keycloak.models.utils.DefaultAuthenticationFlows; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.IDToken; -import org.keycloak.representations.idm.IdentityProviderRepresentation; -import org.keycloak.services.Urls; import org.keycloak.testsuite.MailUtil; import org.keycloak.testsuite.OAuthClient; import org.keycloak.testsuite.broker.util.UserSessionStatusServlet; @@ -55,22 +48,11 @@ import org.keycloak.testsuite.rule.LoggingRule; import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; import org.keycloak.util.JsonSerialization; -import org.openqa.selenium.By; -import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; import javax.mail.MessagingException; import javax.mail.Multipart; import javax.mail.internet.MimeMessage; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.UriBuilder; import java.io.IOException; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractKeycloakIdentityProviderTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractKeycloakIdentityProviderTest.java old mode 100644 new mode 100755 index a2d4935085..f0d2ed0db8 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractKeycloakIdentityProviderTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractKeycloakIdentityProviderTest.java @@ -5,7 +5,6 @@ import java.net.URI; import java.util.Set; import javax.mail.MessagingException; -import javax.mail.Multipart; import javax.mail.internet.MimeMessage; import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; @@ -26,7 +25,6 @@ import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.services.Urls; -import org.keycloak.testsuite.MailUtil; import org.keycloak.testsuite.broker.util.UserSessionStatusServlet; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/BrokerKeyCloakRule.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/BrokerKeyCloakRule.java old mode 100644 new mode 100755 index 438ab93d0c..6e49520668 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/BrokerKeyCloakRule.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/BrokerKeyCloakRule.java @@ -20,7 +20,6 @@ package org.keycloak.testsuite.broker; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.services.managers.RealmManager; -import org.keycloak.testsuite.adapter.CustomerDatabaseServlet; import org.keycloak.testsuite.broker.util.UserSessionStatusServlet; import org.keycloak.testsuite.rule.AbstractKeycloakRule; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/ImportIdentityProviderTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/ImportIdentityProviderTest.java index 4dd34d78d2..91a3958549 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/ImportIdentityProviderTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/ImportIdentityProviderTest.java @@ -34,7 +34,6 @@ import org.keycloak.broker.saml.SAMLIdentityProviderFactory; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.DefaultAuthenticationFlows; -import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.social.facebook.FacebookIdentityProvider; import org.keycloak.social.facebook.FacebookIdentityProviderFactory; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerBasicTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerBasicTest.java index 8be9dcc11c..a3ccf5e083 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerBasicTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerBasicTest.java @@ -6,7 +6,6 @@ import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; -import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.rule.AbstractKeycloakRule; import org.keycloak.testsuite.KeycloakServer; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerWithSignatureTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerWithSignatureTest.java index 197749b170..a3b3d1f1d4 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerWithSignatureTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerWithSignatureTest.java @@ -6,7 +6,6 @@ import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; -import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.rule.AbstractKeycloakRule; import org.keycloak.testsuite.KeycloakServer; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/ldap/base/LDAPGroupMapperSyncTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/ldap/base/LDAPGroupMapperSyncTest.java old mode 100644 new mode 100755 index 1fb20e9311..2d27866e18 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/ldap/base/LDAPGroupMapperSyncTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/ldap/base/LDAPGroupMapperSyncTest.java @@ -3,7 +3,6 @@ package org.keycloak.testsuite.federation.ldap.base; import java.util.List; import java.util.Map; -import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/CustomRegistrationFlowTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/CustomRegistrationFlowTest.java index 8ab67d9194..d776756333 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/CustomRegistrationFlowTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/CustomRegistrationFlowTest.java @@ -25,14 +25,9 @@ import org.junit.Assert; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; -import org.keycloak.OAuth2Constants; -import org.keycloak.events.Details; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.RealmModel; -import org.keycloak.models.UserModel; -import org.keycloak.representations.AccessToken; -import org.keycloak.representations.RefreshToken; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.OAuthClient; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/LoginHotpTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/LoginHotpTest.java index 3721c11e11..6d655d4fbb 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/LoginHotpTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/LoginHotpTest.java @@ -32,7 +32,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserModel; import org.keycloak.models.utils.HmacOTP; -import org.keycloak.models.utils.TimeBasedOTP; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.AssertEvents; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/PassThroughClientAuthenticator.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/PassThroughClientAuthenticator.java old mode 100644 new mode 100755 index 1e2b50a451..ff5331b96a --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/PassThroughClientAuthenticator.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/PassThroughClientAuthenticator.java @@ -9,11 +9,8 @@ import java.util.Map; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.ClientAuthenticationFlowContext; import org.keycloak.authentication.authenticators.client.AbstractClientAuthenticator; -import org.keycloak.events.Details; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.ClientModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; import org.keycloak.provider.ProviderConfigProperty; /** diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserFederationModelTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserFederationModelTest.java old mode 100644 new mode 100755 index 17e0e31c3e..b24bf9f36e --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserFederationModelTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserFederationModelTest.java @@ -2,7 +2,6 @@ package org.keycloak.testsuite.model; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java index 0b45d64ba0..4e2f1f31c5 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java @@ -49,7 +49,6 @@ import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserCredentialModel; -import org.keycloak.models.UserCredentialValueModel; import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.ModelToRepresentation; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/AuthorizationCodeTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/AuthorizationCodeTest.java index 5d5e0edf00..12d443a031 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/AuthorizationCodeTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/AuthorizationCodeTest.java @@ -30,7 +30,6 @@ import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.models.Constants; import org.keycloak.models.RealmModel; -import org.keycloak.protocol.oidc.utils.OIDCResponseType; import org.keycloak.services.managers.ClientSessionCode; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.AssertEvents; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java index 9861ab9687..6b62db8968 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java @@ -23,7 +23,6 @@ package org.keycloak.testsuite.oauth; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.h2.value.ValueStringIgnoreCase; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; @@ -49,8 +48,6 @@ import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; import org.openqa.selenium.WebDriver; -import java.util.HashSet; - import static org.junit.Assert.*; /** diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java index ab99b0c11c..a6bdc2a24d 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java @@ -22,8 +22,6 @@ package org.keycloak.testsuite.rule; import org.junit.Assert; -import org.junit.Rule; -import org.junit.rules.TemporaryFolder; import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; diff --git a/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/JettySamlTest.java b/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/JettySamlTest.java index 6228a688ef..40edb45d0a 100755 --- a/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/JettySamlTest.java +++ b/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/JettySamlTest.java @@ -34,7 +34,6 @@ import org.junit.Test; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.services.managers.RealmManager; -import org.keycloak.testsuite.adapter.AdapterTestStrategy; import org.keycloak.testsuite.keycloaksaml.SamlAdapterTestStrategy; import org.keycloak.testsuite.rule.AbstractKeycloakRule; import org.openqa.selenium.WebDriver; diff --git a/testsuite/performance/pom.xml b/testsuite/performance/pom.xml index 4a3a5c4b60..9e4e60ac86 100755 --- a/testsuite/performance/pom.xml +++ b/testsuite/performance/pom.xml @@ -25,7 +25,8 @@ org.keycloak - keycloak-model-api + keycloak-server-spi + provided org.keycloak diff --git a/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/CreateRealmsWorker.java b/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/CreateRealmsWorker.java index ef640ff6b4..fd3e34a2f9 100755 --- a/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/CreateRealmsWorker.java +++ b/testsuite/performance/src/test/java/org/keycloak/testsuite/performance/CreateRealmsWorker.java @@ -6,7 +6,6 @@ import org.apache.log.Logger; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; -import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.services.managers.RealmManager; import java.util.concurrent.atomic.AtomicInteger; diff --git a/testsuite/tomcat6/src/test/java/org/keycloak/testsuite/TomcatTest.java b/testsuite/tomcat6/src/test/java/org/keycloak/testsuite/TomcatTest.java index 9e0101dccd..7bb428e4c0 100755 --- a/testsuite/tomcat6/src/test/java/org/keycloak/testsuite/TomcatTest.java +++ b/testsuite/tomcat6/src/test/java/org/keycloak/testsuite/TomcatTest.java @@ -24,7 +24,6 @@ package org.keycloak.testsuite; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.keycloak.models.KeycloakSession; diff --git a/testsuite/tomcat7/src/test/java/org/keycloak/testsuite/Tomcat7Test.java b/testsuite/tomcat7/src/test/java/org/keycloak/testsuite/Tomcat7Test.java index 73ec9974e2..0d40fa1dea 100755 --- a/testsuite/tomcat7/src/test/java/org/keycloak/testsuite/Tomcat7Test.java +++ b/testsuite/tomcat7/src/test/java/org/keycloak/testsuite/Tomcat7Test.java @@ -22,11 +22,9 @@ package org.keycloak.testsuite; import org.apache.catalina.startup.Tomcat; -import org.apache.tomcat.util.http.mapper.Mapper; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.keycloak.models.KeycloakSession; diff --git a/testsuite/tomcat8/src/test/java/org/keycloak/testsuite/TomcatSamlTest.java b/testsuite/tomcat8/src/test/java/org/keycloak/testsuite/TomcatSamlTest.java index a4a38299af..dd5509f88c 100755 --- a/testsuite/tomcat8/src/test/java/org/keycloak/testsuite/TomcatSamlTest.java +++ b/testsuite/tomcat8/src/test/java/org/keycloak/testsuite/TomcatSamlTest.java @@ -37,7 +37,6 @@ import org.openqa.selenium.WebDriver; import java.io.File; import java.net.URL; -import java.util.regex.Matcher; /** * @author Stian Thorgersen diff --git a/testsuite/tomcat8/src/test/java/org/keycloak/testsuite/TomcatTest.java b/testsuite/tomcat8/src/test/java/org/keycloak/testsuite/TomcatTest.java index e34a879798..8af57de26f 100755 --- a/testsuite/tomcat8/src/test/java/org/keycloak/testsuite/TomcatTest.java +++ b/testsuite/tomcat8/src/test/java/org/keycloak/testsuite/TomcatTest.java @@ -25,7 +25,6 @@ import org.apache.catalina.startup.Tomcat; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.keycloak.models.KeycloakSession; diff --git a/timer/api/pom.xml b/timer/api/pom.xml index e4a11f03a0..824ace7892 100755 --- a/timer/api/pom.xml +++ b/timer/api/pom.xml @@ -19,7 +19,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/timer/basic/pom.xml b/timer/basic/pom.xml index dc85c8c020..ea6cbe3eb6 100755 --- a/timer/basic/pom.xml +++ b/timer/basic/pom.xml @@ -20,7 +20,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/wildfly/adduser/pom.xml b/wildfly/adduser/pom.xml index 8bf5640300..8d559d1ee8 100755 --- a/wildfly/adduser/pom.xml +++ b/wildfly/adduser/pom.xml @@ -31,7 +31,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi org.keycloak diff --git a/wildfly/extensions/pom.xml b/wildfly/extensions/pom.xml index 2ed94b568b..68189afae3 100755 --- a/wildfly/extensions/pom.xml +++ b/wildfly/extensions/pom.xml @@ -41,7 +41,7 @@ org.keycloak - keycloak-model-api + keycloak-server-spi provided diff --git a/wildfly/extensions/src/main/java/org/keycloak/provider/wildfly/ModuleProviderLoaderFactory.java b/wildfly/extensions/src/main/java/org/keycloak/provider/wildfly/ModuleProviderLoaderFactory.java old mode 100644 new mode 100755 index 217c203ad9..f22a2567d7 --- a/wildfly/extensions/src/main/java/org/keycloak/provider/wildfly/ModuleProviderLoaderFactory.java +++ b/wildfly/extensions/src/main/java/org/keycloak/provider/wildfly/ModuleProviderLoaderFactory.java @@ -3,7 +3,6 @@ package org.keycloak.provider.wildfly; import org.jboss.modules.Module; import org.jboss.modules.ModuleClassLoader; import org.jboss.modules.ModuleIdentifier; -import org.jboss.modules.ModuleLoadException; import org.keycloak.provider.DefaultProviderLoader; import org.keycloak.provider.ProviderLoader; import org.keycloak.provider.ProviderLoaderFactory;