From 158640d1f3f5c6e955c23200e5f82c8fbc271fce Mon Sep 17 00:00:00 2001 From: Michal Hajas Date: Mon, 29 Nov 2021 16:50:35 +0100 Subject: [PATCH] Closes #8954 - move Hot Rod classes to hotRod package --- .../models/map/storage/hotRod/HotRodMapStorage.java | 4 ++-- .../map/storage/hotRod/HotRodMapStorageProvider.java | 4 ++-- .../hotRod/HotRodMapStorageProviderFactory.java | 12 ++++++------ .../map/storage/hotRod/IckleQueryOperators.java | 2 +- .../hotRod}/client/HotRodAttributeEntity.java | 2 +- .../hotRod}/client/HotRodClientEntity.java | 8 +++++--- .../hotRod}/client/HotRodProtocolMapperEntity.java | 5 +++-- .../hotRod}/common/HotRodEntityDescriptor.java | 2 +- .../map/{ => storage/hotRod}/common/HotRodPair.java | 2 +- .../map/{ => storage/hotRod}/common/HotRodUtils.java | 2 +- .../hotRod}/common/ProtoSchemaInitializer.java | 8 ++++---- .../map/{ => storage/hotRod}/common/Versioned.java | 2 +- .../connections/DefaultHotRodConnectionProvider.java | 2 +- .../DefaultHotRodConnectionProviderFactory.java | 8 ++++---- .../connections/HotRodConnectionProvider.java | 2 +- .../connections/HotRodConnectionProviderFactory.java | 2 +- .../hotRod}/connections/HotRodConnectionSpi.java | 2 +- ...tRod.connections.HotRodConnectionProviderFactory} | 2 +- .../META-INF/services/org.keycloak.provider.Spi | 2 +- .../IckleQueryMapModelCriteriaBuilderTest.java | 2 +- .../keycloak/testsuite/model/HotRodServerRule.java | 2 +- .../testsuite/model/parameters/HotRodMapStorage.java | 6 +++--- 22 files changed, 43 insertions(+), 40 deletions(-) rename model/map-hot-rod/src/main/java/org/keycloak/models/map/{ => storage/hotRod}/client/HotRodAttributeEntity.java (97%) rename model/map-hot-rod/src/main/java/org/keycloak/models/map/{ => storage/hotRod}/client/HotRodClientEntity.java (98%) rename model/map-hot-rod/src/main/java/org/keycloak/models/map/{ => storage/hotRod}/client/HotRodProtocolMapperEntity.java (94%) rename model/map-hot-rod/src/main/java/org/keycloak/models/map/{ => storage/hotRod}/common/HotRodEntityDescriptor.java (96%) rename model/map-hot-rod/src/main/java/org/keycloak/models/map/{ => storage/hotRod}/common/HotRodPair.java (96%) rename model/map-hot-rod/src/main/java/org/keycloak/models/map/{ => storage/hotRod}/common/HotRodUtils.java (98%) rename model/map-hot-rod/src/main/java/org/keycloak/models/map/{ => storage/hotRod}/common/ProtoSchemaInitializer.java (83%) rename model/map-hot-rod/src/main/java/org/keycloak/models/map/{ => storage/hotRod}/common/Versioned.java (93%) rename model/map-hot-rod/src/main/java/org/keycloak/models/map/{ => storage/hotRod}/connections/DefaultHotRodConnectionProvider.java (95%) rename model/map-hot-rod/src/main/java/org/keycloak/models/map/{ => storage/hotRod}/connections/DefaultHotRodConnectionProviderFactory.java (94%) rename model/map-hot-rod/src/main/java/org/keycloak/models/map/{ => storage/hotRod}/connections/HotRodConnectionProvider.java (95%) rename model/map-hot-rod/src/main/java/org/keycloak/models/map/{ => storage/hotRod}/connections/HotRodConnectionProviderFactory.java (93%) rename model/map-hot-rod/src/main/java/org/keycloak/models/map/{ => storage/hotRod}/connections/HotRodConnectionSpi.java (95%) rename model/map-hot-rod/src/main/resources/META-INF/services/{org.keycloak.models.map.connections.HotRodConnectionProviderFactory => org.keycloak.models.map.storage.hotRod.connections.HotRodConnectionProviderFactory} (88%) diff --git a/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorage.java b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorage.java index 775ef84f41..0e3644ab3f 100644 --- a/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorage.java +++ b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorage.java @@ -26,7 +26,7 @@ import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; import org.keycloak.models.map.common.AbstractEntity; import org.keycloak.models.map.common.DeepCloner; -import org.keycloak.models.map.common.HotRodEntityDescriptor; +import org.keycloak.models.map.storage.hotRod.common.HotRodEntityDescriptor; import org.keycloak.models.map.common.StringKeyConvertor; import org.keycloak.models.map.common.UpdatableEntity; import org.keycloak.models.map.storage.MapKeycloakTransaction; @@ -46,7 +46,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import static org.keycloak.models.map.common.HotRodUtils.paginateQuery; +import static org.keycloak.models.map.storage.hotRod.common.HotRodUtils.paginateQuery; import static org.keycloak.utils.StreamsUtil.closing; public class HotRodMapStorage implements MapStorage, ConcurrentHashMapCrudOperations { diff --git a/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorageProvider.java b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorageProvider.java index 1f4e94c062..92f45dad0e 100644 --- a/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorageProvider.java +++ b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorageProvider.java @@ -19,10 +19,10 @@ package org.keycloak.models.map.storage.hotRod; import org.keycloak.models.map.common.AbstractEntity; import org.keycloak.models.map.common.DeepCloner; -import org.keycloak.models.map.common.HotRodEntityDescriptor; +import org.keycloak.models.map.storage.hotRod.common.HotRodEntityDescriptor; import org.keycloak.models.map.common.StringKeyConvertor; import org.keycloak.models.map.common.UpdatableEntity; -import org.keycloak.models.map.connections.HotRodConnectionProvider; +import org.keycloak.models.map.storage.hotRod.connections.HotRodConnectionProvider; import org.keycloak.models.map.storage.MapStorage; import org.keycloak.models.map.storage.MapStorageProvider; import org.keycloak.models.map.storage.MapStorageProviderFactory; diff --git a/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorageProviderFactory.java b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorageProviderFactory.java index 94c2d4ea47..3350918d3d 100644 --- a/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorageProviderFactory.java +++ b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorageProviderFactory.java @@ -24,15 +24,15 @@ import org.keycloak.component.AmphibianProviderFactory; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.map.client.HotRodAttributeEntity; -import org.keycloak.models.map.client.HotRodClientEntity; -import org.keycloak.models.map.client.HotRodProtocolMapperEntity; -import org.keycloak.models.map.common.HotRodPair; +import org.keycloak.models.map.storage.hotRod.client.HotRodAttributeEntity; +import org.keycloak.models.map.storage.hotRod.client.HotRodClientEntity; +import org.keycloak.models.map.storage.hotRod.client.HotRodProtocolMapperEntity; +import org.keycloak.models.map.storage.hotRod.common.HotRodPair; import org.keycloak.models.map.client.MapClientEntity; import org.keycloak.models.map.client.MapProtocolMapperEntity; import org.keycloak.models.map.common.DeepCloner; -import org.keycloak.models.map.common.HotRodEntityDescriptor; -import org.keycloak.models.map.connections.HotRodConnectionProvider; +import org.keycloak.models.map.storage.hotRod.common.HotRodEntityDescriptor; +import org.keycloak.models.map.storage.hotRod.connections.HotRodConnectionProvider; import org.keycloak.models.map.storage.MapStorageProvider; import org.keycloak.models.map.storage.MapStorageProviderFactory; import org.keycloak.provider.EnvironmentDependentProviderFactory; diff --git a/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/IckleQueryOperators.java b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/IckleQueryOperators.java index 34202dfbd4..c962c8015e 100644 --- a/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/IckleQueryOperators.java +++ b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/IckleQueryOperators.java @@ -31,7 +31,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; /** - * This class provides knowledge on how to build Ickle query where clauses for specified {@link ModelCriteriaBuilder.Operator}. + * This class provides knowledge on how to build Ickle query where clauses for specified {@link ModelCriteriaBuilder.Operator}. *

* For example, *

diff --git a/model/map-hot-rod/src/main/java/org/keycloak/models/map/client/HotRodAttributeEntity.java b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/client/HotRodAttributeEntity.java similarity index 97% rename from model/map-hot-rod/src/main/java/org/keycloak/models/map/client/HotRodAttributeEntity.java rename to model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/client/HotRodAttributeEntity.java index 3b6f9e0b97..ca5ded6c02 100644 --- a/model/map-hot-rod/src/main/java/org/keycloak/models/map/client/HotRodAttributeEntity.java +++ b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/client/HotRodAttributeEntity.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.models.map.client; +package org.keycloak.models.map.storage.hotRod.client; import org.infinispan.protostream.annotations.ProtoField; diff --git a/model/map-hot-rod/src/main/java/org/keycloak/models/map/client/HotRodClientEntity.java b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/client/HotRodClientEntity.java similarity index 98% rename from model/map-hot-rod/src/main/java/org/keycloak/models/map/client/HotRodClientEntity.java rename to model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/client/HotRodClientEntity.java index 493a2a77a0..3f2c75292c 100644 --- a/model/map-hot-rod/src/main/java/org/keycloak/models/map/client/HotRodClientEntity.java +++ b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/client/HotRodClientEntity.java @@ -15,12 +15,14 @@ * limitations under the License. */ -package org.keycloak.models.map.client; +package org.keycloak.models.map.storage.hotRod.client; import org.infinispan.protostream.annotations.ProtoField; +import org.keycloak.models.map.client.MapClientEntity; +import org.keycloak.models.map.client.MapProtocolMapperEntity; import org.keycloak.models.map.common.DeepCloner; -import org.keycloak.models.map.common.HotRodPair; -import org.keycloak.models.map.common.Versioned; +import org.keycloak.models.map.storage.hotRod.common.HotRodPair; +import org.keycloak.models.map.storage.hotRod.common.Versioned; import java.util.Collection; import java.util.Collections; diff --git a/model/map-hot-rod/src/main/java/org/keycloak/models/map/client/HotRodProtocolMapperEntity.java b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/client/HotRodProtocolMapperEntity.java similarity index 94% rename from model/map-hot-rod/src/main/java/org/keycloak/models/map/client/HotRodProtocolMapperEntity.java rename to model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/client/HotRodProtocolMapperEntity.java index 96683184c0..0b7a7e19dc 100644 --- a/model/map-hot-rod/src/main/java/org/keycloak/models/map/client/HotRodProtocolMapperEntity.java +++ b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/client/HotRodProtocolMapperEntity.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package org.keycloak.models.map.client; +package org.keycloak.models.map.storage.hotRod.client; import org.infinispan.protostream.annotations.ProtoField; -import org.keycloak.models.map.common.HotRodPair; +import org.keycloak.models.map.client.MapProtocolMapperEntity; +import org.keycloak.models.map.storage.hotRod.common.HotRodPair; import java.util.LinkedHashSet; import java.util.Map; diff --git a/model/map-hot-rod/src/main/java/org/keycloak/models/map/common/HotRodEntityDescriptor.java b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/HotRodEntityDescriptor.java similarity index 96% rename from model/map-hot-rod/src/main/java/org/keycloak/models/map/common/HotRodEntityDescriptor.java rename to model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/HotRodEntityDescriptor.java index 2423dd4fc1..5fd43f2889 100644 --- a/model/map-hot-rod/src/main/java/org/keycloak/models/map/common/HotRodEntityDescriptor.java +++ b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/HotRodEntityDescriptor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.models.map.common; +package org.keycloak.models.map.storage.hotRod.common; import java.util.List; import java.util.stream.Stream; diff --git a/model/map-hot-rod/src/main/java/org/keycloak/models/map/common/HotRodPair.java b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/HotRodPair.java similarity index 96% rename from model/map-hot-rod/src/main/java/org/keycloak/models/map/common/HotRodPair.java rename to model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/HotRodPair.java index 906d9bffbc..d025e0d6d3 100644 --- a/model/map-hot-rod/src/main/java/org/keycloak/models/map/common/HotRodPair.java +++ b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/HotRodPair.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.models.map.common; +package org.keycloak.models.map.storage.hotRod.common; import org.infinispan.protostream.WrappedMessage; import org.infinispan.protostream.annotations.ProtoField; diff --git a/model/map-hot-rod/src/main/java/org/keycloak/models/map/common/HotRodUtils.java b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/HotRodUtils.java similarity index 98% rename from model/map-hot-rod/src/main/java/org/keycloak/models/map/common/HotRodUtils.java rename to model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/HotRodUtils.java index cfb9f4c699..c5502c0536 100644 --- a/model/map-hot-rod/src/main/java/org/keycloak/models/map/common/HotRodUtils.java +++ b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/HotRodUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.models.map.common; +package org.keycloak.models.map.storage.hotRod.common; import org.infinispan.manager.DefaultCacheManager; import org.infinispan.query.dsl.Query; diff --git a/model/map-hot-rod/src/main/java/org/keycloak/models/map/common/ProtoSchemaInitializer.java b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/ProtoSchemaInitializer.java similarity index 83% rename from model/map-hot-rod/src/main/java/org/keycloak/models/map/common/ProtoSchemaInitializer.java rename to model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/ProtoSchemaInitializer.java index 762a6fceb7..1385d15125 100644 --- a/model/map-hot-rod/src/main/java/org/keycloak/models/map/common/ProtoSchemaInitializer.java +++ b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/ProtoSchemaInitializer.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.keycloak.models.map.common; +package org.keycloak.models.map.storage.hotRod.common; import org.infinispan.protostream.GeneratedSchema; import org.infinispan.protostream.annotations.AutoProtoSchemaBuilder; -import org.keycloak.models.map.client.HotRodAttributeEntity; -import org.keycloak.models.map.client.HotRodClientEntity; -import org.keycloak.models.map.client.HotRodProtocolMapperEntity; +import org.keycloak.models.map.storage.hotRod.client.HotRodAttributeEntity; +import org.keycloak.models.map.storage.hotRod.client.HotRodClientEntity; +import org.keycloak.models.map.storage.hotRod.client.HotRodProtocolMapperEntity; /** * @author Martin Kanis diff --git a/model/map-hot-rod/src/main/java/org/keycloak/models/map/common/Versioned.java b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/Versioned.java similarity index 93% rename from model/map-hot-rod/src/main/java/org/keycloak/models/map/common/Versioned.java rename to model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/Versioned.java index c048381fa4..d099e4222f 100644 --- a/model/map-hot-rod/src/main/java/org/keycloak/models/map/common/Versioned.java +++ b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/Versioned.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.models.map.common; +package org.keycloak.models.map.storage.hotRod.common; public interface Versioned { int getEntityVersion(); diff --git a/model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/DefaultHotRodConnectionProvider.java b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/DefaultHotRodConnectionProvider.java similarity index 95% rename from model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/DefaultHotRodConnectionProvider.java rename to model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/DefaultHotRodConnectionProvider.java index 1b289f1ac1..464b6041a7 100644 --- a/model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/DefaultHotRodConnectionProvider.java +++ b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/DefaultHotRodConnectionProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.models.map.connections; +package org.keycloak.models.map.storage.hotRod.connections; import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.RemoteCacheManager; diff --git a/model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/DefaultHotRodConnectionProviderFactory.java b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/DefaultHotRodConnectionProviderFactory.java similarity index 94% rename from model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/DefaultHotRodConnectionProviderFactory.java rename to model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/DefaultHotRodConnectionProviderFactory.java index e5e3030568..52301ffc44 100644 --- a/model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/DefaultHotRodConnectionProviderFactory.java +++ b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/DefaultHotRodConnectionProviderFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.models.map.connections; +package org.keycloak.models.map.storage.hotRod.connections; import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.RemoteCacheManager; @@ -26,9 +26,9 @@ import org.infinispan.query.remote.client.ProtobufMetadataManagerConstants; import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.map.common.HotRodEntityDescriptor; -import org.keycloak.models.map.common.HotRodUtils; -import org.keycloak.models.map.common.ProtoSchemaInitializer; +import org.keycloak.models.map.storage.hotRod.common.HotRodEntityDescriptor; +import org.keycloak.models.map.storage.hotRod.common.HotRodUtils; +import org.keycloak.models.map.storage.hotRod.common.ProtoSchemaInitializer; import org.keycloak.models.map.storage.hotRod.HotRodMapStorageProviderFactory; import java.net.URI; diff --git a/model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/HotRodConnectionProvider.java b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/HotRodConnectionProvider.java similarity index 95% rename from model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/HotRodConnectionProvider.java rename to model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/HotRodConnectionProvider.java index a7268dab6f..4cd44ab554 100644 --- a/model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/HotRodConnectionProvider.java +++ b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/HotRodConnectionProvider.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.models.map.connections; +package org.keycloak.models.map.storage.hotRod.connections; import org.infinispan.client.hotrod.RemoteCache; import org.keycloak.provider.Provider; diff --git a/model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/HotRodConnectionProviderFactory.java b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/HotRodConnectionProviderFactory.java similarity index 93% rename from model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/HotRodConnectionProviderFactory.java rename to model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/HotRodConnectionProviderFactory.java index cba9798e94..03ca08f638 100644 --- a/model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/HotRodConnectionProviderFactory.java +++ b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/HotRodConnectionProviderFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.models.map.connections; +package org.keycloak.models.map.storage.hotRod.connections; import org.keycloak.provider.ProviderFactory; diff --git a/model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/HotRodConnectionSpi.java b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/HotRodConnectionSpi.java similarity index 95% rename from model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/HotRodConnectionSpi.java rename to model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/HotRodConnectionSpi.java index 54be770f92..780839df6c 100644 --- a/model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/HotRodConnectionSpi.java +++ b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/HotRodConnectionSpi.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.models.map.connections; +package org.keycloak.models.map.storage.hotRod.connections; import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderFactory; diff --git a/model/map-hot-rod/src/main/resources/META-INF/services/org.keycloak.models.map.connections.HotRodConnectionProviderFactory b/model/map-hot-rod/src/main/resources/META-INF/services/org.keycloak.models.map.storage.hotRod.connections.HotRodConnectionProviderFactory similarity index 88% rename from model/map-hot-rod/src/main/resources/META-INF/services/org.keycloak.models.map.connections.HotRodConnectionProviderFactory rename to model/map-hot-rod/src/main/resources/META-INF/services/org.keycloak.models.map.storage.hotRod.connections.HotRodConnectionProviderFactory index 1d08505e2b..bd7910fe4e 100644 --- a/model/map-hot-rod/src/main/resources/META-INF/services/org.keycloak.models.map.connections.HotRodConnectionProviderFactory +++ b/model/map-hot-rod/src/main/resources/META-INF/services/org.keycloak.models.map.storage.hotRod.connections.HotRodConnectionProviderFactory @@ -15,4 +15,4 @@ # limitations under the License. # -org.keycloak.models.map.connections.DefaultHotRodConnectionProviderFactory \ No newline at end of file +org.keycloak.models.map.storage.hotRod.connections.DefaultHotRodConnectionProviderFactory \ No newline at end of file diff --git a/model/map-hot-rod/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/model/map-hot-rod/src/main/resources/META-INF/services/org.keycloak.provider.Spi index bc573c7fd3..00d6ad2c47 100644 --- a/model/map-hot-rod/src/main/resources/META-INF/services/org.keycloak.provider.Spi +++ b/model/map-hot-rod/src/main/resources/META-INF/services/org.keycloak.provider.Spi @@ -15,4 +15,4 @@ # limitations under the License. # -org.keycloak.models.map.connections.HotRodConnectionSpi \ No newline at end of file +org.keycloak.models.map.storage.hotRod.connections.HotRodConnectionSpi \ No newline at end of file diff --git a/model/map-hot-rod/src/test/java/org/keycloak/models/map/storage/hotRod/IckleQueryMapModelCriteriaBuilderTest.java b/model/map-hot-rod/src/test/java/org/keycloak/models/map/storage/hotRod/IckleQueryMapModelCriteriaBuilderTest.java index 6ea10cc6cf..c46419bf32 100644 --- a/model/map-hot-rod/src/test/java/org/keycloak/models/map/storage/hotRod/IckleQueryMapModelCriteriaBuilderTest.java +++ b/model/map-hot-rod/src/test/java/org/keycloak/models/map/storage/hotRod/IckleQueryMapModelCriteriaBuilderTest.java @@ -19,7 +19,7 @@ package org.keycloak.models.map.storage.hotRod; import org.junit.Test; import org.keycloak.models.ClientModel; -import org.keycloak.models.map.client.HotRodClientEntity; +import org.keycloak.models.map.storage.hotRod.client.HotRodClientEntity; import org.keycloak.models.map.storage.ModelCriteriaBuilder; import org.keycloak.models.map.storage.criteria.DefaultModelCriteria; diff --git a/testsuite/model/src/main/java/org/keycloak/testsuite/model/HotRodServerRule.java b/testsuite/model/src/main/java/org/keycloak/testsuite/model/HotRodServerRule.java index 87a2cc7bfa..a39bf8779a 100644 --- a/testsuite/model/src/main/java/org/keycloak/testsuite/model/HotRodServerRule.java +++ b/testsuite/model/src/main/java/org/keycloak/testsuite/model/HotRodServerRule.java @@ -14,7 +14,7 @@ import org.infinispan.server.hotrod.configuration.HotRodServerConfiguration; import org.infinispan.server.hotrod.configuration.HotRodServerConfigurationBuilder; import org.junit.rules.ExternalResource; import org.keycloak.Config; -import org.keycloak.models.map.common.HotRodUtils; +import org.keycloak.models.map.storage.hotRod.common.HotRodUtils; import java.io.IOException; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/HotRodMapStorage.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/HotRodMapStorage.java index 1b57fbf38b..7224b89c82 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/HotRodMapStorage.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/HotRodMapStorage.java @@ -28,9 +28,9 @@ import org.keycloak.models.map.authSession.MapRootAuthenticationSessionProviderF import org.keycloak.models.map.authorization.MapAuthorizationStoreFactory; import org.keycloak.models.map.client.MapClientProviderFactory; import org.keycloak.models.map.clientscope.MapClientScopeProviderFactory; -import org.keycloak.models.map.connections.DefaultHotRodConnectionProviderFactory; -import org.keycloak.models.map.connections.HotRodConnectionProviderFactory; -import org.keycloak.models.map.connections.HotRodConnectionSpi; +import org.keycloak.models.map.storage.hotRod.connections.DefaultHotRodConnectionProviderFactory; +import org.keycloak.models.map.storage.hotRod.connections.HotRodConnectionProviderFactory; +import org.keycloak.models.map.storage.hotRod.connections.HotRodConnectionSpi; import org.keycloak.models.map.deploymentState.MapDeploymentStateProviderFactory; import org.keycloak.models.map.group.MapGroupProviderFactory; import org.keycloak.models.map.loginFailure.MapUserLoginFailureProviderFactory;