libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

Closes #8954 - move Hot Rod classes to hotRod package

Browse source
This commit is contained in:
Michal Hajas 2021-11-29 16:50:35 +01:00 committed by Hynek Mlnařík
parent cd5ccdbf3e
commit 158640d1f3
22 changed files with 43 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorage.java
View file

@ -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<K, V extends AbstractEntity & UpdatableEntity, M> implements MapStorage<V, M>, ConcurrentHashMapCrudOperations<V, M> {

4
model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorageProvider.java
View file

@ -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;

12
model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/HotRodMapStorageProviderFactory.java
View file

@ -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;

2
model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/IckleQueryOperators.java
View file

@ -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}.
* <p/>
* For example,
* <p/>

2
model/map-hot-rod/src/main/java/org/keycloak/models/map/client/HotRodAttributeEntity.java → model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/client/HotRodAttributeEntity.java
View file

@ -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;

8
model/map-hot-rod/src/main/java/org/keycloak/models/map/client/HotRodClientEntity.java → model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/client/HotRodClientEntity.java
View file

@ -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;

5
model/map-hot-rod/src/main/java/org/keycloak/models/map/client/HotRodProtocolMapperEntity.java → model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/client/HotRodProtocolMapperEntity.java
View file

@ -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;

2
model/map-hot-rod/src/main/java/org/keycloak/models/map/common/HotRodEntityDescriptor.java → model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/HotRodEntityDescriptor.java
View file

@ -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;

2
model/map-hot-rod/src/main/java/org/keycloak/models/map/common/HotRodPair.java → model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/HotRodPair.java
View file

@ -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;

2
model/map-hot-rod/src/main/java/org/keycloak/models/map/common/HotRodUtils.java → model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/HotRodUtils.java
View file

@ -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;

8
model/map-hot-rod/src/main/java/org/keycloak/models/map/common/ProtoSchemaInitializer.java → model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/ProtoSchemaInitializer.java
View file

@ -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 <a href="mailto:mkanis@redhat.com">Martin Kanis</a>

2
model/map-hot-rod/src/main/java/org/keycloak/models/map/common/Versioned.java → model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/common/Versioned.java
View file

@ -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();

2
model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/DefaultHotRodConnectionProvider.java → model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/DefaultHotRodConnectionProvider.java
View file

@ -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;

8
model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/DefaultHotRodConnectionProviderFactory.java → model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/DefaultHotRodConnectionProviderFactory.java
View file

@ -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;

2
model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/HotRodConnectionProvider.java → model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/HotRodConnectionProvider.java
View file

@ -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;

2
model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/HotRodConnectionProviderFactory.java → model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/HotRodConnectionProviderFactory.java
View file

@ -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;

2
model/map-hot-rod/src/main/java/org/keycloak/models/map/connections/HotRodConnectionSpi.java → model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/connections/HotRodConnectionSpi.java
View file

@ -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;

2
model/map-hot-rod/src/main/resources/META-INF/services/org.keycloak.models.map.connections.HotRodConnectionProviderFactory → model/map-hot-rod/src/main/resources/META-INF/services/org.keycloak.models.map.storage.hotRod.connections.HotRodConnectionProviderFactory
View file

@ -15,4 +15,4 @@
# limitations under the License.
#
org.keycloak.models.map.connections.DefaultHotRodConnectionProviderFactory
org.keycloak.models.map.storage.hotRod.connections.DefaultHotRodConnectionProviderFactory

2
model/map-hot-rod/src/main/resources/META-INF/services/org.keycloak.provider.Spi
View file

@ -15,4 +15,4 @@
# limitations under the License.
#
org.keycloak.models.map.connections.HotRodConnectionSpi
org.keycloak.models.map.storage.hotRod.connections.HotRodConnectionSpi

2
model/map-hot-rod/src/test/java/org/keycloak/models/map/storage/hotRod/IckleQueryMapModelCriteriaBuilderTest.java
View file

@ -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;

2
testsuite/model/src/main/java/org/keycloak/testsuite/model/HotRodServerRule.java
View file

@ -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;

6
testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/HotRodMapStorage.java
View file

@ -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;