From 87fbe2327047bc8b29cee7e500c917c4846828f5 Mon Sep 17 00:00:00 2001 From: vramik Date: Wed, 18 Sep 2024 12:22:03 +0200 Subject: [PATCH] Make `QuarkusLiquibaseConnectionProvider` extending `DefaultLiquibaseConnectionProvider` to allow `indexCreationThreshold` working Closes #32860 Signed-off-by: vramik --- .../quarkus/deployment/CacheBuildSteps.java | 2 +- .../quarkus/deployment/KeycloakProcessor.java | 2 +- .../quarkus/runtime/KeycloakRecorder.java | 2 +- .../QuarkusJpaConnectionProviderFactory.java | 5 +- .../liquibase/QuarkusJpaUpdaterProvider.java | 2 +- .../QuarkusJpaUpdaterProviderFactory.java | 2 +- .../QuarkusLiquibaseConnectionProvider.java | 79 +++++++++ .../infinispan/CacheManagerFactory.java | 2 +- .../QuarkusCacheManagerProvider.java | 2 +- .../QuarkusInfinispanConnectionFactory.java | 2 +- .../QuarkusLiquibaseConnectionProvider.java | 152 ------------------ ...ycloak.cluster.ManagedCacheManagerProvider | 19 ++- ...nispan.InfinispanConnectionProviderFactory | 2 +- ...nnections.jpa.JpaConnectionProviderFactory | 2 +- ...ions.jpa.updater.JpaUpdaterProviderFactory | 2 +- ...se.conn.LiquibaseConnectionProviderFactory | 2 +- 16 files changed, 111 insertions(+), 168 deletions(-) rename quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/{legacy/database => database/jpa}/QuarkusJpaConnectionProviderFactory.java (97%) rename quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/{legacy => database}/liquibase/QuarkusJpaUpdaterProvider.java (99%) mode change 100755 => 100644 rename quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/{legacy => database}/liquibase/QuarkusJpaUpdaterProviderFactory.java (96%) mode change 100755 => 100644 create mode 100644 quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusLiquibaseConnectionProvider.java rename quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/{legacy => }/infinispan/CacheManagerFactory.java (99%) rename quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/{legacy => }/infinispan/QuarkusCacheManagerProvider.java (95%) rename quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/{legacy => }/infinispan/QuarkusInfinispanConnectionFactory.java (96%) delete mode 100644 quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/liquibase/QuarkusLiquibaseConnectionProvider.java diff --git a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/CacheBuildSteps.java b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/CacheBuildSteps.java index 837857a9e9..24a6699ac6 100644 --- a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/CacheBuildSteps.java +++ b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/CacheBuildSteps.java @@ -27,7 +27,7 @@ import io.quarkus.deployment.builditem.ShutdownContextBuildItem; import io.quarkus.deployment.logging.LoggingSetupBuildItem; import jakarta.enterprise.context.ApplicationScoped; import org.keycloak.quarkus.runtime.KeycloakRecorder; -import org.keycloak.quarkus.runtime.storage.legacy.infinispan.CacheManagerFactory; +import org.keycloak.quarkus.runtime.storage.infinispan.CacheManagerFactory; public class CacheBuildSteps { diff --git a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java index a7db209294..5c0b319c53 100644 --- a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java +++ b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java @@ -162,7 +162,7 @@ import static org.keycloak.quarkus.runtime.configuration.Configuration.getProper import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX; import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_QUARKUS; import static org.keycloak.quarkus.runtime.configuration.QuarkusPropertiesConfigSource.QUARKUS_PROPERTY_ENABLED; -import static org.keycloak.quarkus.runtime.storage.legacy.database.QuarkusJpaConnectionProviderFactory.QUERY_PROPERTY_PREFIX; +import static org.keycloak.quarkus.runtime.storage.database.jpa.QuarkusJpaConnectionProviderFactory.QUERY_PROPERTY_PREFIX; import static org.keycloak.representations.provider.ScriptProviderDescriptor.AUTHENTICATORS; import static org.keycloak.representations.provider.ScriptProviderDescriptor.MAPPERS; import static org.keycloak.representations.provider.ScriptProviderDescriptor.POLICIES; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakRecorder.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakRecorder.java index 2edcc0ea1a..a0a00e025b 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakRecorder.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakRecorder.java @@ -44,7 +44,7 @@ import org.keycloak.quarkus.runtime.configuration.Configuration; import org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider; import org.keycloak.quarkus.runtime.integration.QuarkusKeycloakSessionFactory; import org.keycloak.quarkus.runtime.storage.database.liquibase.FastServiceLocator; -import org.keycloak.quarkus.runtime.storage.legacy.infinispan.CacheManagerFactory; +import org.keycloak.quarkus.runtime.storage.infinispan.CacheManagerFactory; import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.theme.ClasspathThemeProviderFactory; import org.keycloak.truststore.TruststoreBuilder; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/database/QuarkusJpaConnectionProviderFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/QuarkusJpaConnectionProviderFactory.java similarity index 97% rename from quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/database/QuarkusJpaConnectionProviderFactory.java rename to quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/QuarkusJpaConnectionProviderFactory.java index c459f4eb0f..195a15679f 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/database/QuarkusJpaConnectionProviderFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/QuarkusJpaConnectionProviderFactory.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.keycloak.quarkus.runtime.storage.legacy.database; +package org.keycloak.quarkus.runtime.storage.database.jpa; import static org.keycloak.connections.jpa.util.JpaUtils.configureNamedQuery; -import static org.keycloak.quarkus.runtime.storage.legacy.liquibase.QuarkusJpaUpdaterProvider.VERIFY_AND_RUN_MASTER_CHANGELOG; +import static org.keycloak.quarkus.runtime.storage.database.liquibase.QuarkusJpaUpdaterProvider.VERIFY_AND_RUN_MASTER_CHANGELOG; import static org.keycloak.models.utils.KeycloakModelUtils.runJobInTransaction; import java.io.File; @@ -54,7 +54,6 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.provider.ServerInfoAwareProviderFactory; import org.keycloak.quarkus.runtime.Environment; -import org.keycloak.quarkus.runtime.storage.database.jpa.AbstractJpaConnectionProviderFactory; /** * @author Stian Thorgersen diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/liquibase/QuarkusJpaUpdaterProvider.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusJpaUpdaterProvider.java old mode 100755 new mode 100644 similarity index 99% rename from quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/liquibase/QuarkusJpaUpdaterProvider.java rename to quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusJpaUpdaterProvider.java index cf2de9e501..4a53213938 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/liquibase/QuarkusJpaUpdaterProvider.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusJpaUpdaterProvider.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.quarkus.runtime.storage.legacy.liquibase; +package org.keycloak.quarkus.runtime.storage.database.liquibase; import java.io.File; import java.io.FileWriter; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/liquibase/QuarkusJpaUpdaterProviderFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusJpaUpdaterProviderFactory.java old mode 100755 new mode 100644 similarity index 96% rename from quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/liquibase/QuarkusJpaUpdaterProviderFactory.java rename to quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusJpaUpdaterProviderFactory.java index de44ffe41a..284a8245c6 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/liquibase/QuarkusJpaUpdaterProviderFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusJpaUpdaterProviderFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.quarkus.runtime.storage.legacy.liquibase; +package org.keycloak.quarkus.runtime.storage.database.liquibase; import org.keycloak.Config; import org.keycloak.connections.jpa.updater.JpaUpdaterProvider; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusLiquibaseConnectionProvider.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusLiquibaseConnectionProvider.java new file mode 100644 index 0000000000..a6e1607ea3 --- /dev/null +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusLiquibaseConnectionProvider.java @@ -0,0 +1,79 @@ +/* + * Copyright 2021 Red Hat, Inc. and/or its affiliates + * and other contributors as indicated by the @author tags. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.keycloak.quarkus.runtime.storage.database.liquibase; + +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; +import javax.xml.parsers.SAXParserFactory; +import liquibase.Scope; +import liquibase.parser.ChangeLogParser; +import liquibase.parser.ChangeLogParserFactory; +import liquibase.parser.core.xml.XMLChangeLogSAXParser; +import liquibase.ui.LoggerUIService; +import org.jboss.logging.Logger; +import org.keycloak.connections.jpa.updater.liquibase.conn.DefaultLiquibaseConnectionProvider; + +public class QuarkusLiquibaseConnectionProvider extends DefaultLiquibaseConnectionProvider { + + private static final Logger logger = Logger.getLogger(QuarkusLiquibaseConnectionProvider.class); + + + @Override + protected void baseLiquibaseInitialization() { + + // initialize Liquibase using a custom scope + final Map scopeValues = new HashMap<>(); + scopeValues.put(Scope.Attr.ui.name(), new LoggerUIService()); + try { + Scope.enter(scopeValues); + } catch (Exception e) { + throw new RuntimeException("Failed to initialize Liquibase: " + e.getMessage(), e); + } + + // disables XML validation + for (ChangeLogParser parser : ChangeLogParserFactory.getInstance().getParsers()) { + if (parser instanceof XMLChangeLogSAXParser) { + Method getSaxParserFactory = null; + try { + getSaxParserFactory = XMLChangeLogSAXParser.class.getDeclaredMethod("getSaxParserFactory"); + getSaxParserFactory.setAccessible(true); + SAXParserFactory saxParserFactory = (SAXParserFactory) getSaxParserFactory.invoke(parser); + saxParserFactory.setValidating(false); + saxParserFactory.setSchema(null); + } catch (Exception e) { + logger.warnf("Failed to disable liquibase XML validations"); + } finally { + if (getSaxParserFactory != null) { + getSaxParserFactory.setAccessible(false); + } + } + } + } + } + + @Override + public String getId() { + return "quarkus"; + } + + @Override + public int order() { + return 100; + } +} diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/CacheManagerFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/infinispan/CacheManagerFactory.java similarity index 99% rename from quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/CacheManagerFactory.java rename to quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/infinispan/CacheManagerFactory.java index 121a41e738..c69e083463 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/CacheManagerFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/infinispan/CacheManagerFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.quarkus.runtime.storage.legacy.infinispan; +package org.keycloak.quarkus.runtime.storage.infinispan; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/QuarkusCacheManagerProvider.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/infinispan/QuarkusCacheManagerProvider.java similarity index 95% rename from quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/QuarkusCacheManagerProvider.java rename to quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/infinispan/QuarkusCacheManagerProvider.java index 72709e03d1..053325eb43 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/QuarkusCacheManagerProvider.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/infinispan/QuarkusCacheManagerProvider.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.quarkus.runtime.storage.legacy.infinispan; +package org.keycloak.quarkus.runtime.storage.infinispan; import io.quarkus.arc.Arc; import org.keycloak.Config; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/QuarkusInfinispanConnectionFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/infinispan/QuarkusInfinispanConnectionFactory.java similarity index 96% rename from quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/QuarkusInfinispanConnectionFactory.java rename to quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/infinispan/QuarkusInfinispanConnectionFactory.java index 12dabba584..0168a4b936 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/QuarkusInfinispanConnectionFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/infinispan/QuarkusInfinispanConnectionFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.quarkus.runtime.storage.legacy.infinispan; +package org.keycloak.quarkus.runtime.storage.infinispan; import org.infinispan.manager.EmbeddedCacheManager; import org.keycloak.connections.infinispan.DefaultInfinispanConnectionProviderFactory; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/liquibase/QuarkusLiquibaseConnectionProvider.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/liquibase/QuarkusLiquibaseConnectionProvider.java deleted file mode 100644 index a508905a28..0000000000 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/liquibase/QuarkusLiquibaseConnectionProvider.java +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Copyright 2021 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.keycloak.quarkus.runtime.storage.legacy.liquibase; - -import java.lang.reflect.Method; -import java.sql.Connection; -import java.util.HashMap; -import java.util.Map; - -import javax.xml.parsers.SAXParserFactory; - -import liquibase.Scope; -import liquibase.ui.LoggerUIService; -import org.jboss.logging.Logger; -import org.keycloak.Config; -import org.keycloak.connections.jpa.updater.liquibase.conn.KeycloakLiquibase; -import org.keycloak.connections.jpa.updater.liquibase.conn.LiquibaseConnectionProvider; -import org.keycloak.connections.jpa.updater.liquibase.conn.LiquibaseConnectionProviderFactory; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; - -import liquibase.database.Database; -import liquibase.database.DatabaseFactory; -import liquibase.database.jvm.JdbcConnection; -import liquibase.exception.LiquibaseException; -import liquibase.parser.ChangeLogParser; -import liquibase.parser.ChangeLogParserFactory; -import liquibase.parser.core.xml.XMLChangeLogSAXParser; -import liquibase.resource.ClassLoaderResourceAccessor; -import liquibase.resource.ResourceAccessor; - -public class QuarkusLiquibaseConnectionProvider implements LiquibaseConnectionProviderFactory, LiquibaseConnectionProvider { - - private static final Logger logger = Logger.getLogger(QuarkusLiquibaseConnectionProvider.class); - - private volatile boolean initialized = false; - private ClassLoaderResourceAccessor resourceAccessor; - - @Override - public LiquibaseConnectionProvider create(KeycloakSession session) { - if (!initialized) { - synchronized (this) { - if (!initialized) { - baseLiquibaseInitialization(session); - initialized = true; - } - } - } - return this; - } - - protected void baseLiquibaseInitialization(KeycloakSession session) { - resourceAccessor = new ClassLoaderResourceAccessor(getClass().getClassLoader()); - - // initialize Liquibase using a custom scope - final Map scopeValues = new HashMap<>(); - scopeValues.put(Scope.Attr.ui.name(), new LoggerUIService()); - try { - Scope scope = Scope.getCurrentScope(); - scope.enter(scopeValues); - } catch (Exception e) { - throw new RuntimeException("Failed to initialize Liquibase: " + e.getMessage(), e); - } - - // disables XML validation - for (ChangeLogParser parser : ChangeLogParserFactory.getInstance().getParsers()) { - if (parser instanceof XMLChangeLogSAXParser) { - Method getSaxParserFactory = null; - try { - getSaxParserFactory = XMLChangeLogSAXParser.class.getDeclaredMethod("getSaxParserFactory"); - getSaxParserFactory.setAccessible(true); - SAXParserFactory saxParserFactory = (SAXParserFactory) getSaxParserFactory.invoke(parser); - saxParserFactory.setValidating(false); - saxParserFactory.setSchema(null); - } catch (Exception e) { - logger.warnf("Failed to disable liquibase XML validations"); - } finally { - if (getSaxParserFactory != null) { - getSaxParserFactory.setAccessible(false); - } - } - } - } - } - - @Override - public void init(Config.Scope config) { - - } - - @Override - public void postInit(KeycloakSessionFactory factory) { - } - - @Override - public void close() { - } - - @Override - public String getId() { - return "quarkus"; - } - - @Override - public KeycloakLiquibase getLiquibase(Connection connection, String defaultSchema) throws LiquibaseException { - Database database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(new JdbcConnection(connection)); - if (defaultSchema != null) { - database.setDefaultSchemaName(defaultSchema); - } - - String changelog = QuarkusJpaUpdaterProvider.CHANGELOG; - - logger.debugf("Using changelog file %s and changelogTableName %s", changelog, database.getDatabaseChangeLogTableName()); - - return new KeycloakLiquibase(changelog, resourceAccessor, database); - } - - @Override - public KeycloakLiquibase getLiquibaseForCustomUpdate(Connection connection, String defaultSchema, String changelogLocation, ClassLoader classloader, String changelogTableName) throws LiquibaseException { - Database database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(new JdbcConnection(connection)); - if (defaultSchema != null) { - database.setDefaultSchemaName(defaultSchema); - } - - ResourceAccessor resourceAccessor = new ClassLoaderResourceAccessor(classloader); - database.setDatabaseChangeLogTableName(changelogTableName); - - logger.debugf("Using changelog file %s and changelogTableName %s", changelogLocation, database.getDatabaseChangeLogTableName()); - - return new KeycloakLiquibase(changelogLocation, resourceAccessor, database); - } - - @Override - public int order() { - return 100; - } -} diff --git a/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.cluster.ManagedCacheManagerProvider b/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.cluster.ManagedCacheManagerProvider index a5bd1cdbc8..e0488026ff 100644 --- a/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.cluster.ManagedCacheManagerProvider +++ b/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.cluster.ManagedCacheManagerProvider @@ -1 +1,18 @@ -org.keycloak.quarkus.runtime.storage.legacy.infinispan.QuarkusCacheManagerProvider \ No newline at end of file +# +# Copyright 2021 Red Hat, Inc. and/or its affiliates +# and other contributors as indicated by the @author tags. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +org.keycloak.quarkus.runtime.storage.infinispan.QuarkusCacheManagerProvider \ No newline at end of file diff --git a/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.connections.infinispan.InfinispanConnectionProviderFactory b/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.connections.infinispan.InfinispanConnectionProviderFactory index b0480f6044..fec4d5c4bd 100644 --- a/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.connections.infinispan.InfinispanConnectionProviderFactory +++ b/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.connections.infinispan.InfinispanConnectionProviderFactory @@ -17,4 +17,4 @@ # */ # -org.keycloak.quarkus.runtime.storage.legacy.infinispan.QuarkusInfinispanConnectionFactory \ No newline at end of file +org.keycloak.quarkus.runtime.storage.infinispan.QuarkusInfinispanConnectionFactory \ No newline at end of file diff --git a/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.connections.jpa.JpaConnectionProviderFactory b/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.connections.jpa.JpaConnectionProviderFactory index 1abe5c5582..71601689ff 100644 --- a/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.connections.jpa.JpaConnectionProviderFactory +++ b/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.connections.jpa.JpaConnectionProviderFactory @@ -15,4 +15,4 @@ # limitations under the License. # -org.keycloak.quarkus.runtime.storage.legacy.database.QuarkusJpaConnectionProviderFactory +org.keycloak.quarkus.runtime.storage.database.jpa.QuarkusJpaConnectionProviderFactory diff --git a/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.connections.jpa.updater.JpaUpdaterProviderFactory b/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.connections.jpa.updater.JpaUpdaterProviderFactory index 9881d369b8..6e984000de 100644 --- a/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.connections.jpa.updater.JpaUpdaterProviderFactory +++ b/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.connections.jpa.updater.JpaUpdaterProviderFactory @@ -15,4 +15,4 @@ # limitations under the License. # -org.keycloak.quarkus.runtime.storage.legacy.liquibase.QuarkusJpaUpdaterProviderFactory \ No newline at end of file +org.keycloak.quarkus.runtime.storage.database.liquibase.QuarkusJpaUpdaterProviderFactory \ No newline at end of file diff --git a/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.connections.jpa.updater.liquibase.conn.LiquibaseConnectionProviderFactory b/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.connections.jpa.updater.liquibase.conn.LiquibaseConnectionProviderFactory index 3bd6e9d61a..d12cc0bfe9 100644 --- a/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.connections.jpa.updater.liquibase.conn.LiquibaseConnectionProviderFactory +++ b/quarkus/runtime/src/main/resources/META-INF/services/org.keycloak.connections.jpa.updater.liquibase.conn.LiquibaseConnectionProviderFactory @@ -15,4 +15,4 @@ # limitations under the License. # -org.keycloak.quarkus.runtime.storage.legacy.liquibase.QuarkusLiquibaseConnectionProvider \ No newline at end of file +org.keycloak.quarkus.runtime.storage.database.liquibase.QuarkusLiquibaseConnectionProvider \ No newline at end of file