diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/cache/CacheTestParams.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/cache/CacheTestParams.java index 543179c8..dc336191 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/cache/CacheTestParams.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/cache/CacheTestParams.java @@ -38,7 +38,7 @@ import io.valkey.springframework.data.valkey.test.XstreamOxmSerializerSingleton; import io.valkey.springframework.data.valkey.test.condition.ValkeyDetector; import io.valkey.springframework.data.valkey.test.extension.ValkeyCluster; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -60,17 +60,17 @@ private static Collection connectionFactories() { // Jedis Standalone JedisConnectionFactory jedisConnectionFactory = JedisConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); factoryList.add(jedisConnectionFactory); // Lettuce Standalone LettuceConnectionFactory lettuceConnectionFactory = LettuceConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); factoryList.add(lettuceConnectionFactory); // ValkeyGlide Standalone ValkeyGlideConnectionFactory valkeyGlideConnectionFactory = ValkeyGlideConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); factoryList.add(valkeyGlideConnectionFactory); if (clusterAvailable()) { diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/jedis/ScanTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/jedis/ScanTests.java index 8a2e8242..a8518672 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/jedis/ScanTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/jedis/ScanTests.java @@ -38,7 +38,7 @@ import io.valkey.springframework.data.valkey.core.ValkeyTemplate; import io.valkey.springframework.data.valkey.core.ScanOptions; import io.valkey.springframework.data.valkey.core.StringValkeyTemplate; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; import io.valkey.springframework.data.valkey.test.extension.parametrized.MethodSource; import io.valkey.springframework.data.valkey.test.extension.parametrized.ParameterizedValkeyTest; @@ -62,14 +62,14 @@ public ScanTests(ValkeyConnectionFactory factory) { public static List params() { JedisConnectionFactory jedisConnectionFactory = JedisConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); LettuceConnectionFactory lettuceConnectionFactory = LettuceConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); // Pretty strange that Lettuce is used in Jedis-tree test - adding Valkey-Glide as well ValkeyGlideConnectionFactory valkeyGlideConnectionFactory = ValkeyGlideConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); return Arrays.asList(jedisConnectionFactory, lettuceConnectionFactory, valkeyGlideConnectionFactory); } diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/jedis/extension/JedisConnectionFactoryExtension.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/jedis/extension/JedisConnectionFactoryExtension.java index 2d754ae2..0def855e 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/jedis/extension/JedisConnectionFactoryExtension.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/jedis/extension/JedisConnectionFactoryExtension.java @@ -36,17 +36,17 @@ import io.valkey.springframework.data.valkey.connection.jedis.JedisConnectionFactory; import io.valkey.springframework.data.valkey.test.extension.ValkeyCluster; import io.valkey.springframework.data.valkey.test.extension.ValkeySentinel; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; import io.valkey.springframework.data.valkey.test.extension.ShutdownQueue; import org.springframework.data.util.Lazy; /** * JUnit {@link ParameterResolver} providing pre-cached {@link JedisConnectionFactory} instances. Connection factories - * can be qualified with {@code @ValkeyStanalone} (default), {@code @ValkeySentinel} or {@code @ValkeyCluster} to obtain a + * can be qualified with {@code @ValkeyStandalone} (default), {@code @ValkeySentinel} or {@code @ValkeyCluster} to obtain a * specific factory instance. Instances are managed by this extension and will be shut down on JVM shutdown. * * @author Mark Paluch - * @see ValkeyStanalone + * @see ValkeyStandalone * @see ValkeySentinel * @see ValkeyCluster */ @@ -99,7 +99,7 @@ public class JedisConnectionFactoryExtension implements ParameterResolver { static { factories = new HashMap<>(); - factories.put(ValkeyStanalone.class, STANDALONE); + factories.put(ValkeyStandalone.class, STANDALONE); factories.put(ValkeySentinel.class, SENTINEL); factories.put(ValkeyCluster.class, CLUSTER); } @@ -108,7 +108,7 @@ public class JedisConnectionFactoryExtension implements ParameterResolver { * Obtain a cached {@link JedisConnectionFactory} described by {@code qualifier}. Instances are managed by this * extension and will be shut down on JVM shutdown. * - * @param qualifier an be any of {@link ValkeyStanalone}, {@link ValkeySentinel}, {@link ValkeyCluster}. + * @param qualifier an be any of {@link ValkeyStandalone}, {@link ValkeySentinel}, {@link ValkeyCluster}. * @return the managed {@link JedisConnectionFactory}. */ public static JedisConnectionFactory getConnectionFactory(Class qualifier) { @@ -119,7 +119,7 @@ public static JedisConnectionFactory getConnectionFactory(Class qualifier) { @@ -153,7 +153,7 @@ private static Class getQualifier(ParameterContext paramet return ValkeyCluster.class; } - return ValkeyStanalone.class; + return ValkeyStandalone.class; } static class NewableLazy { diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/lettuce/LettuceConnectionFactoryUnitTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/lettuce/LettuceConnectionFactoryUnitTests.java index a0fe8daf..95342b90 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/lettuce/LettuceConnectionFactoryUnitTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/lettuce/LettuceConnectionFactoryUnitTests.java @@ -1157,7 +1157,7 @@ void createMinimalValkeyStandaloneConfiguration() { } @Test // GH-2116 - void createFullValkeyStanaloneConfiguration() { + void createFullValkeyStandaloneConfiguration() { RedisURI redisURI = RedisURI.create("redis://fooUser:fooPass@myserver1:111/7"); diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/lettuce/extension/LettuceConnectionFactoryExtension.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/lettuce/extension/LettuceConnectionFactoryExtension.java index d578e594..f8db8507 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/lettuce/extension/LettuceConnectionFactoryExtension.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/lettuce/extension/LettuceConnectionFactoryExtension.java @@ -40,17 +40,17 @@ import io.valkey.springframework.data.valkey.test.extension.LettuceTestClientResources; import io.valkey.springframework.data.valkey.test.extension.ValkeyCluster; import io.valkey.springframework.data.valkey.test.extension.ValkeySentinel; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; import io.valkey.springframework.data.valkey.test.extension.ShutdownQueue; import org.springframework.data.util.Lazy; /** * JUnit {@link ParameterResolver} providing pre-cached {@link LettuceConnectionFactory} instances. Connection factories - * can be qualified with {@code @ValkeyStanalone} (default), {@code @ValkeySentinel} or {@code @ValkeyCluster} to obtain a + * can be qualified with {@code @ValkeyStandalone} (default), {@code @ValkeySentinel} or {@code @ValkeyCluster} to obtain a * specific factory instance. Instances are managed by this extension and will be shut down on JVM shutdown. * * @author Mark Paluch - * @see ValkeyStanalone + * @see ValkeyStandalone * @see ValkeySentinel * @see ValkeyCluster */ @@ -155,12 +155,12 @@ private static LettuceClientConfiguration defaultClientConfiguration() { static { pooledFactories = new HashMap<>(); - pooledFactories.put(ValkeyStanalone.class, STANDALONE); + pooledFactories.put(ValkeyStandalone.class, STANDALONE); pooledFactories.put(ValkeySentinel.class, SENTINEL); pooledFactories.put(ValkeyCluster.class, CLUSTER); unpooledFactories = new HashMap<>(); - unpooledFactories.put(ValkeyStanalone.class, STANDALONE_UNPOOLED); + unpooledFactories.put(ValkeyStandalone.class, STANDALONE_UNPOOLED); unpooledFactories.put(ValkeySentinel.class, SENTINEL_UNPOOLED); unpooledFactories.put(ValkeyCluster.class, CLUSTER_UNPOOLED); } @@ -169,7 +169,7 @@ private static LettuceClientConfiguration defaultClientConfiguration() { * Obtain a {@link LettuceConnectionFactory} described by {@code qualifier}. Instances are managed by this extension * and will be shut down on JVM shutdown. * - * @param qualifier an be any of {@link ValkeyStanalone}, {@link ValkeySentinel}, {@link ValkeyCluster}. + * @param qualifier an be any of {@link ValkeyStandalone}, {@link ValkeySentinel}, {@link ValkeyCluster}. * @return the managed {@link LettuceConnectionFactory}. */ public static LettuceConnectionFactory getConnectionFactory(Class qualifier) { @@ -180,7 +180,7 @@ public static LettuceConnectionFactory getConnectionFactory(Class qualifier, boolean pooled) { @@ -215,7 +215,7 @@ private static Class getQualifier(ParameterContext paramet return ValkeyCluster.class; } - return ValkeyStanalone.class; + return ValkeyStandalone.class; } static class ManagedLettuceConnectionFactory extends LettuceConnectionFactory diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/valkeyglide/AbstractValkeyGlideIntegrationTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/valkeyglide/AbstractValkeyGlideIntegrationTests.java index db7dad67..8aa20aca 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/valkeyglide/AbstractValkeyGlideIntegrationTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/valkeyglide/AbstractValkeyGlideIntegrationTests.java @@ -34,7 +34,7 @@ import io.valkey.springframework.data.valkey.connection.ValkeyConnection; import io.valkey.springframework.data.valkey.connection.ValkeyConnectionFactory; import io.valkey.springframework.data.valkey.connection.valkeyglide.extension.ValkeyGlideConnectionFactoryExtension; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; /** * Abstract base class for Valkey Glide integration tests that provides common setup, @@ -65,7 +65,7 @@ public abstract class AbstractValkeyGlideIntegrationTests { protected ValkeyConnection connection; @BeforeAll - void setUpAll(@ValkeyStanalone ValkeyConnectionFactory connectionFactory) { + void setUpAll(@ValkeyStandalone ValkeyConnectionFactory connectionFactory) { // Create connection factory this.connectionFactory = connectionFactory; validateServerExistance(connectionFactory); diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/valkeyglide/ValkeyGlideZSetOrderingIntegrationTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/valkeyglide/ValkeyGlideZSetOrderingIntegrationTests.java index cbb11a19..074b84f4 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/valkeyglide/ValkeyGlideZSetOrderingIntegrationTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/valkeyglide/ValkeyGlideZSetOrderingIntegrationTests.java @@ -26,7 +26,7 @@ import io.valkey.springframework.data.valkey.core.ZSetOperations; import io.valkey.springframework.data.valkey.test.condition.EnabledOnValkeyClusterAvailable; import io.valkey.springframework.data.valkey.test.extension.ValkeyCluster; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; /** * Integration tests verifying that ZSet rangeWithScores operations maintain @@ -40,7 +40,7 @@ class ValkeyGlideZSetOrderingIntegrationTests { @Test void rangeWithScoresStandaloneOrder() { StringValkeyTemplate template = new StringValkeyTemplate( - ValkeyGlideConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class)); + ValkeyGlideConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class)); try { ZSetOperations opsForZSet = template.opsForZSet(); diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/valkeyglide/extension/ValkeyGlideConnectionFactoryExtension.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/valkeyglide/extension/ValkeyGlideConnectionFactoryExtension.java index 9c5c513a..5318ec5d 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/valkeyglide/extension/ValkeyGlideConnectionFactoryExtension.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/connection/valkeyglide/extension/ValkeyGlideConnectionFactoryExtension.java @@ -35,20 +35,20 @@ import io.valkey.springframework.data.valkey.connection.valkeyglide.ValkeyGlideConnectionFactory; import io.valkey.springframework.data.valkey.test.extension.ValkeyCluster; import io.valkey.springframework.data.valkey.test.extension.ValkeySentinel; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; import io.valkey.springframework.data.valkey.test.extension.ShutdownQueue; import org.springframework.data.util.Lazy; /** * JUnit {@link ParameterResolver} providing pre-cached {@link ValkeyGlideConnectionFactory} instances. Connection factories - * can be qualified with {@code @ValkeyStanalone} (default) or {@code @ValkeyCluster} to obtain a specific factory instance. + * can be qualified with {@code @ValkeyStandalone} (default) or {@code @ValkeyCluster} to obtain a specific factory instance. * Instances are managed by this extension and will be shut down on JVM shutdown. * *

Note: Sentinel configurations are not supported by Valkey-Glide and will throw an * {@link UnsupportedOperationException}. * * @author Ilia Kolominsky - * @see ValkeyStanalone + * @see ValkeyStandalone * @see ValkeyCluster */ public class ValkeyGlideConnectionFactoryExtension implements ParameterResolver { @@ -88,7 +88,7 @@ public class ValkeyGlideConnectionFactoryExtension implements ParameterResolver static { factories = new HashMap<>(); - factories.put(ValkeyStanalone.class, STANDALONE); + factories.put(ValkeyStandalone.class, STANDALONE); factories.put(ValkeyCluster.class, CLUSTER); // Sentinel is not supported by Valkey-Glide - omitted intentionally } @@ -97,7 +97,7 @@ public class ValkeyGlideConnectionFactoryExtension implements ParameterResolver * Obtain a cached {@link ValkeyGlideConnectionFactory} described by {@code qualifier}. Instances are managed by this * extension and will be shut down on JVM shutdown. * - * @param qualifier can be any of {@link ValkeyStanalone}, {@link ValkeyCluster}. {@link ValkeySentinel} is not supported. + * @param qualifier can be any of {@link ValkeyStandalone}, {@link ValkeyCluster}. {@link ValkeySentinel} is not supported. * @return the managed {@link ValkeyGlideConnectionFactory}. * @throws UnsupportedOperationException if {@link ValkeySentinel} is requested. */ @@ -119,7 +119,7 @@ public static ValkeyGlideConnectionFactory getConnectionFactory(Class getQualifier(ParameterContext paramet return ValkeyCluster.class; } - return ValkeyStanalone.class; + return ValkeyStandalone.class; } static class NewableLazy { diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/AbstractOperationsTestParams.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/AbstractOperationsTestParams.java index 6d1e5a87..422963e0 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/AbstractOperationsTestParams.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/AbstractOperationsTestParams.java @@ -38,7 +38,7 @@ import io.valkey.springframework.data.valkey.serializer.OxmSerializer; import io.valkey.springframework.data.valkey.serializer.StringValkeySerializer; import io.valkey.springframework.data.valkey.test.XstreamOxmSerializerSingleton; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; /** * Parameters for testing implementations of {@link AbstractOperations} @@ -54,9 +54,9 @@ abstract public class AbstractOperationsTestParams { public static Collection testParams() { List params = new ArrayList<>(); - params.addAll(testParams(LettuceConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class))); - params.addAll(testParams(JedisConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class))); - params.addAll(testParams(ValkeyGlideConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class))); + params.addAll(testParams(LettuceConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class))); + params.addAll(testParams(JedisConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class))); + params.addAll(testParams(ValkeyGlideConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class))); return params; } diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/BoundOperationsProxyFactoryRuntimeHintTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/BoundOperationsProxyFactoryRuntimeHintTests.java index 897a3e9a..67d81ccb 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/BoundOperationsProxyFactoryRuntimeHintTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/BoundOperationsProxyFactoryRuntimeHintTests.java @@ -26,7 +26,7 @@ import io.valkey.springframework.data.valkey.connection.DataType; import io.valkey.springframework.data.valkey.connection.lettuce.LettuceConnectionFactory; import io.valkey.springframework.data.valkey.connection.lettuce.extension.LettuceConnectionFactoryExtension; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; /** * @author Christoph Strobl @@ -38,7 +38,7 @@ class BoundOperationsProxyFactoryRuntimeHintTests { void boundOpsRuntimeHints() { LettuceConnectionFactory connectionFactory = LettuceConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); ValkeyTemplate template = new ValkeyTemplate<>(); template.setConnectionFactory(connectionFactory); template.afterPropertiesSet(); diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/DefaultHashOperationsIntegrationTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/DefaultHashOperationsIntegrationTests.java index 8779b172..c17663c2 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/DefaultHashOperationsIntegrationTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/DefaultHashOperationsIntegrationTests.java @@ -41,7 +41,7 @@ import io.valkey.springframework.data.valkey.core.ExpireChanges.ExpiryChangeState; import io.valkey.springframework.data.valkey.core.types.Expirations.TimeToLive; import io.valkey.springframework.data.valkey.test.condition.EnabledOnCommand; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; import io.valkey.springframework.data.valkey.test.extension.parametrized.MethodSource; import io.valkey.springframework.data.valkey.test.extension.parametrized.ParameterizedValkeyTest; @@ -79,7 +79,7 @@ public static Collection testParams() { ObjectFactory rawFactory = new RawObjectFactory(); JedisConnectionFactory jedisConnectionFactory = JedisConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); ValkeyTemplate stringTemplate = new StringValkeyTemplate(); stringTemplate.setConnectionFactory(jedisConnectionFactory); @@ -91,7 +91,7 @@ public static Collection testParams() { rawTemplate.afterPropertiesSet(); ValkeyGlideConnectionFactory valkeyGlideConnectionFactory = ValkeyGlideConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); ValkeyTemplate vgStringTemplate = new StringValkeyTemplate(); vgStringTemplate.setConnectionFactory(valkeyGlideConnectionFactory); diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/DefaultStreamOperationsIntegrationTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/DefaultStreamOperationsIntegrationTests.java index 236ede15..ffcd8e0d 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/DefaultStreamOperationsIntegrationTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/DefaultStreamOperationsIntegrationTests.java @@ -52,7 +52,7 @@ import io.valkey.springframework.data.valkey.test.condition.EnabledOnValkeyVersion; import io.valkey.springframework.data.valkey.test.condition.ValkeyDetector; import io.valkey.springframework.data.valkey.test.extension.ValkeyCluster; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; import io.valkey.springframework.data.valkey.test.extension.parametrized.MethodSource; import io.valkey.springframework.data.valkey.test.extension.parametrized.ParameterizedValkeyTest; @@ -91,7 +91,7 @@ public static Collection testParams() { List params = new ArrayList<>(); params.addAll(AbstractOperationsTestParams - .testParams(JedisConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class))); + .testParams(JedisConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class))); if (ValkeyDetector.isClusterAvailable()) { params.addAll(AbstractOperationsTestParams @@ -99,7 +99,7 @@ public static Collection testParams() { } params.addAll(AbstractOperationsTestParams - .testParams(LettuceConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class))); + .testParams(LettuceConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class))); if (ValkeyDetector.isClusterAvailable()) { params.addAll(AbstractOperationsTestParams @@ -107,7 +107,7 @@ public static Collection testParams() { } params.addAll(AbstractOperationsTestParams - .testParams(ValkeyGlideConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class))); + .testParams(ValkeyGlideConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class))); if (ValkeyDetector.isClusterAvailable()) { params.addAll(AbstractOperationsTestParams diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/MultithreadedValkeyTemplateIntegrationTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/MultithreadedValkeyTemplateIntegrationTests.java index 443bb98c..55afe67b 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/MultithreadedValkeyTemplateIntegrationTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/MultithreadedValkeyTemplateIntegrationTests.java @@ -30,7 +30,7 @@ import io.valkey.springframework.data.valkey.connection.lettuce.extension.LettuceConnectionFactoryExtension; import io.valkey.springframework.data.valkey.connection.valkeyglide.ValkeyGlideConnectionFactory; import io.valkey.springframework.data.valkey.connection.valkeyglide.extension.ValkeyGlideConnectionFactoryExtension; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; import io.valkey.springframework.data.valkey.test.extension.parametrized.MethodSource; import io.valkey.springframework.data.valkey.test.extension.parametrized.ParameterizedValkeyTest; @@ -50,9 +50,9 @@ public MultithreadedValkeyTemplateIntegrationTests(ValkeyConnectionFactory facto public static Collection testParams() { - JedisConnectionFactory jedis = JedisConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class); - LettuceConnectionFactory lettuce = LettuceConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class); - ValkeyGlideConnectionFactory valkeyGlide = ValkeyGlideConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class); + JedisConnectionFactory jedis = JedisConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class); + LettuceConnectionFactory lettuce = LettuceConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class); + ValkeyGlideConnectionFactory valkeyGlide = ValkeyGlideConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class); return Arrays.asList(jedis, lettuce, valkeyGlide); } diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/ReactiveOperationsTestParams.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/ReactiveOperationsTestParams.java index 8d517a7a..82acc735 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/ReactiveOperationsTestParams.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/ReactiveOperationsTestParams.java @@ -42,7 +42,7 @@ import io.valkey.springframework.data.valkey.test.XstreamOxmSerializerSingleton; import io.valkey.springframework.data.valkey.test.condition.ValkeyDetector; import io.valkey.springframework.data.valkey.test.extension.ValkeyCluster; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; import org.springframework.lang.Nullable; /** @@ -63,7 +63,7 @@ abstract public class ReactiveOperationsTestParams { ObjectFactory personFactory = new PersonObjectFactory(); LettuceConnectionFactory lettuceConnectionFactory = LettuceConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); ReactiveValkeyTemplate objectTemplate = new ReactiveValkeyTemplate<>(lettuceConnectionFactory, ValkeySerializationContext.java(ReactiveOperationsTestParams.class.getClassLoader())); diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/ValkeyKeyValueTemplateTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/ValkeyKeyValueTemplateTests.java index cbdb8e1a..fbbae7df 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/ValkeyKeyValueTemplateTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/ValkeyKeyValueTemplateTests.java @@ -39,7 +39,7 @@ import io.valkey.springframework.data.valkey.connection.valkeyglide.extension.ValkeyGlideConnectionFactoryExtension; import io.valkey.springframework.data.valkey.core.index.Indexed; import io.valkey.springframework.data.valkey.core.mapping.ValkeyMappingContext; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; import io.valkey.springframework.data.valkey.test.extension.parametrized.MethodSource; import io.valkey.springframework.data.valkey.test.extension.parametrized.ParameterizedValkeyTest; import org.springframework.lang.Nullable; @@ -66,9 +66,9 @@ public ValkeyKeyValueTemplateTests(ValkeyConnectionFactory connectionFactory) { public static List params() { - JedisConnectionFactory jedis = JedisConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class); - LettuceConnectionFactory lettuce = LettuceConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class); - ValkeyGlideConnectionFactory valkeyGlide = ValkeyGlideConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class); + JedisConnectionFactory jedis = JedisConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class); + LettuceConnectionFactory lettuce = LettuceConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class); + ValkeyGlideConnectionFactory valkeyGlide = ValkeyGlideConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class); return Arrays.asList(jedis, lettuce, valkeyGlide); } diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/script/DefaultReactiveScriptExecutorTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/script/DefaultReactiveScriptExecutorTests.java index 917fea00..7d281d1e 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/script/DefaultReactiveScriptExecutorTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/script/DefaultReactiveScriptExecutorTests.java @@ -44,7 +44,7 @@ import io.valkey.springframework.data.valkey.serializer.ValkeySerializationContext; import io.valkey.springframework.data.valkey.serializer.ValkeySerializationContext.ValkeySerializationContextBuilder; import io.valkey.springframework.data.valkey.serializer.StringValkeySerializer; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; import org.springframework.scripting.support.StaticScriptSource; /** @@ -60,7 +60,7 @@ public class DefaultReactiveScriptExecutorTests { @BeforeAll static void setUp() { - connectionFactory = LettuceConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class); + connectionFactory = LettuceConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class); stringTemplate = new StringValkeyTemplate(connectionFactory); stringScriptExecutor = new DefaultReactiveScriptExecutor<>(connectionFactory, ValkeySerializationContext.string()); diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/script/jedis/JedisDefaultScriptExecutorTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/script/jedis/JedisDefaultScriptExecutorTests.java index e3ab3fe5..bdf5fdbd 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/script/jedis/JedisDefaultScriptExecutorTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/script/jedis/JedisDefaultScriptExecutorTests.java @@ -23,7 +23,7 @@ import io.valkey.springframework.data.valkey.connection.jedis.extension.JedisConnectionFactoryExtension; import io.valkey.springframework.data.valkey.core.script.AbstractDefaultScriptExecutorTests; import io.valkey.springframework.data.valkey.core.script.DefaultScriptExecutor; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; /** * Integration test of {@link DefaultScriptExecutor} with {@link Jedis}. @@ -34,7 +34,7 @@ public class JedisDefaultScriptExecutorTests extends AbstractDefaultScriptExecut @Override protected ValkeyConnectionFactory getConnectionFactory() { - return JedisConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class); + return JedisConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class); } @Disabled("transactional execution is currently not supported with Jedis") diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/script/lettuce/LettuceDefaultScriptExecutorTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/script/lettuce/LettuceDefaultScriptExecutorTests.java index 4a863a0d..67584999 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/script/lettuce/LettuceDefaultScriptExecutorTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/core/script/lettuce/LettuceDefaultScriptExecutorTests.java @@ -19,7 +19,7 @@ import io.valkey.springframework.data.valkey.connection.lettuce.extension.LettuceConnectionFactoryExtension; import io.valkey.springframework.data.valkey.core.script.AbstractDefaultScriptExecutorTests; import io.valkey.springframework.data.valkey.core.script.DefaultScriptExecutor; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; /** * Integration test of {@link DefaultScriptExecutor} with Lettuce. @@ -31,6 +31,6 @@ public class LettuceDefaultScriptExecutorTests extends AbstractDefaultScriptExec @Override protected ValkeyConnectionFactory getConnectionFactory() { - return LettuceConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class); + return LettuceConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class); } } diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/KeyExpirationEventMessageListenerIntegrationTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/KeyExpirationEventMessageListenerIntegrationTests.java index 84b70edb..9a3ef14b 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/KeyExpirationEventMessageListenerIntegrationTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/KeyExpirationEventMessageListenerIntegrationTests.java @@ -34,7 +34,7 @@ import io.valkey.springframework.data.valkey.connection.ValkeyConnectionFactory; import io.valkey.springframework.data.valkey.connection.jedis.JedisConnectionFactory; import io.valkey.springframework.data.valkey.connection.jedis.extension.JedisConnectionFactoryExtension; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; /** * @author Christoph Strobl @@ -53,7 +53,7 @@ void setUp() { publisherMock = mock(ApplicationEventPublisher.class); - this.connectionFactory = JedisConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class); + this.connectionFactory = JedisConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class); container = new ValkeyMessageListenerContainer(); container.setConnectionFactory(connectionFactory); diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/PubSubResubscribeTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/PubSubResubscribeTests.java index c27e87f8..41efbe1c 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/PubSubResubscribeTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/PubSubResubscribeTests.java @@ -47,7 +47,7 @@ import io.valkey.springframework.data.valkey.test.condition.EnabledIfLongRunningTest; import io.valkey.springframework.data.valkey.test.condition.ValkeyDetector; import io.valkey.springframework.data.valkey.test.extension.ValkeyCluster; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; import io.valkey.springframework.data.valkey.test.extension.parametrized.MethodSource; import io.valkey.springframework.data.valkey.test.extension.parametrized.ParameterizedValkeyTest; @@ -84,13 +84,13 @@ public static Collection testParams() { // Jedis JedisConnectionFactory jedisConnFactory = JedisConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); factories.add(jedisConnFactory); // Lettuce LettuceConnectionFactory lettuceConnFactory = LettuceConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); factories.add(lettuceConnFactory); @@ -105,7 +105,7 @@ public static Collection testParams() { // Valkey-GLIDE ValkeyGlideConnectionFactory glideConnFactory = ValkeyGlideConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); factories.add(glideConnFactory); diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/PubSubTestParams.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/PubSubTestParams.java index f6746113..26e59396 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/PubSubTestParams.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/PubSubTestParams.java @@ -32,7 +32,7 @@ import io.valkey.springframework.data.valkey.core.StringValkeyTemplate; import io.valkey.springframework.data.valkey.test.condition.ValkeyDetector; import io.valkey.springframework.data.valkey.test.extension.ValkeyCluster; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; /** * @author Costin Leau @@ -47,7 +47,7 @@ public static Collection testParams() { ObjectFactory personFactory = new PersonObjectFactory(); JedisConnectionFactory jedisConnFactory = JedisConnectionFactoryExtension - .getNewConnectionFactory(ValkeyStanalone.class); + .getNewConnectionFactory(ValkeyStandalone.class); jedisConnFactory.afterPropertiesSet(); @@ -62,7 +62,7 @@ public static Collection testParams() { // add Lettuce LettuceConnectionFactory lettuceConnFactory = LettuceConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); ValkeyTemplate stringTemplateLtc = new StringValkeyTemplate(lettuceConnFactory); ValkeyTemplate personTemplateLtc = new ValkeyTemplate<>(); @@ -75,7 +75,7 @@ public static Collection testParams() { // add Valkey Glide ValkeyGlideConnectionFactory glideConnFactory = ValkeyGlideConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); ValkeyTemplate stringTemplateGlide = new StringValkeyTemplate(glideConnFactory); ValkeyTemplate personTemplateGlide = new ValkeyTemplate<>(); diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/ReactiveOperationsTestParams.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/ReactiveOperationsTestParams.java index 8b492579..dc506096 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/ReactiveOperationsTestParams.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/ReactiveOperationsTestParams.java @@ -27,7 +27,7 @@ import io.valkey.springframework.data.valkey.connection.lettuce.LettuceConnectionFactory; import io.valkey.springframework.data.valkey.connection.lettuce.extension.LettuceConnectionFactoryExtension; import io.valkey.springframework.data.valkey.test.condition.ValkeyDetector; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; /** * Parameters for testing implementations of {@link ReactiveValkeyMessageListenerContainer} @@ -39,9 +39,9 @@ class ReactiveOperationsTestParams { public static Collection testParams() { LettuceConnectionFactory lettuceConnectionFactory = LettuceConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class, false); + .getConnectionFactory(ValkeyStandalone.class, false); LettuceConnectionFactory poolingConnectionFactory = LettuceConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class, true); + .getConnectionFactory(ValkeyStandalone.class, true); List list = Arrays.asList(new Object[][] { // { lettuceConnectionFactory, "Standalone" }, // @@ -54,7 +54,7 @@ public static Collection testParams() { clusterConfiguration.addClusterNode(new ValkeyClusterNode(CLUSTER_HOST, MASTER_NODE_1_PORT)); LettuceConnectionFactory lettuceClusterConnectionFactory = LettuceConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); list = new ArrayList<>(list); list.add(new Object[] { lettuceClusterConnectionFactory, "Cluster" }); diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/SubscriptionConnectionTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/SubscriptionConnectionTests.java index 93721028..5edc41f2 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/SubscriptionConnectionTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/SubscriptionConnectionTests.java @@ -37,7 +37,7 @@ import io.valkey.springframework.data.valkey.connection.valkeyglide.ValkeyGlideConnectionFactory; import io.valkey.springframework.data.valkey.connection.valkeyglide.extension.ValkeyGlideConnectionFactoryExtension; import io.valkey.springframework.data.valkey.listener.adapter.MessageListenerAdapter; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; import io.valkey.springframework.data.valkey.test.extension.parametrized.MethodSource; import io.valkey.springframework.data.valkey.test.extension.parametrized.ParameterizedValkeyTest; @@ -74,15 +74,15 @@ public static Collection testParams() { // Jedis JedisConnectionFactory jedisConnFactory = JedisConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); // Lettuce LettuceConnectionFactory lettuceConnFactory = LettuceConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); // Valkey-GLIDE ValkeyGlideConnectionFactory glideConnFactory = ValkeyGlideConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); return Arrays.asList(new Object[][] { { jedisConnFactory }, { lettuceConnFactory }, { glideConnFactory } }); } diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/ValkeyMessageListenerContainerIntegrationTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/ValkeyMessageListenerContainerIntegrationTests.java index 677325d7..1ebedce8 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/ValkeyMessageListenerContainerIntegrationTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/listener/ValkeyMessageListenerContainerIntegrationTests.java @@ -41,7 +41,7 @@ import io.valkey.springframework.data.valkey.connection.lettuce.extension.LettuceConnectionFactoryExtension; import io.valkey.springframework.data.valkey.connection.valkeyglide.ValkeyGlideConnectionFactory; import io.valkey.springframework.data.valkey.connection.valkeyglide.extension.ValkeyGlideConnectionFactoryExtension; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; import io.valkey.springframework.data.valkey.test.extension.parametrized.MethodSource; import io.valkey.springframework.data.valkey.test.extension.parametrized.ParameterizedValkeyTest; import org.springframework.lang.Nullable; @@ -75,16 +75,16 @@ public static Collection testParams() { // Jedis JedisConnectionFactory jedisConnFactory = JedisConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); // Lettuce LettuceConnectionFactory lettuceConnFactory = LettuceConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); // Valkey-GLIDE ValkeyGlideConnectionFactory glideConnFactory = ValkeyGlideConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); return Arrays.asList(new Object[][] { { jedisConnFactory }, { lettuceConnFactory } , { glideConnFactory} }); } diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/mapping/Jackson2HashMapperIntegrationTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/mapping/Jackson2HashMapperIntegrationTests.java index 65471eab..0ca4eea4 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/mapping/Jackson2HashMapperIntegrationTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/mapping/Jackson2HashMapperIntegrationTests.java @@ -34,7 +34,7 @@ import io.valkey.springframework.data.valkey.connection.valkeyglide.extension.ValkeyGlideConnectionFactoryExtension; import io.valkey.springframework.data.valkey.core.ValkeyTemplate; import io.valkey.springframework.data.valkey.hash.Jackson2HashMapper; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; import io.valkey.springframework.data.valkey.test.extension.parametrized.MethodSource; import io.valkey.springframework.data.valkey.test.extension.parametrized.ParameterizedValkeyTest; @@ -62,9 +62,9 @@ public Jackson2HashMapperIntegrationTests(ValkeyConnectionFactory factory) throw public static Collection params() { - return Arrays.asList(JedisConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class), - LettuceConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class), - ValkeyGlideConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class)); + return Arrays.asList(JedisConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class), + LettuceConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class), + ValkeyGlideConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class)); } @BeforeEach diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/repository/cdi/ValkeyCdiDependenciesProducer.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/repository/cdi/ValkeyCdiDependenciesProducer.java index 9f21509e..db82e8cd 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/repository/cdi/ValkeyCdiDependenciesProducer.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/repository/cdi/ValkeyCdiDependenciesProducer.java @@ -27,7 +27,7 @@ import io.valkey.springframework.data.valkey.core.ValkeyOperations; import io.valkey.springframework.data.valkey.core.ValkeyTemplate; import io.valkey.springframework.data.valkey.core.mapping.ValkeyMappingContext; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; /** * @author Mark Paluch @@ -39,7 +39,7 @@ public class ValkeyCdiDependenciesProducer { */ @Produces public ValkeyConnectionFactory valkeyConnectionFactory() { - return ValkeyGlideConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class); + return ValkeyGlideConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class); } /** diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/repository/support/QueryByExampleValkeyExecutorIntegrationTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/repository/support/QueryByExampleValkeyExecutorIntegrationTests.java index 3d8f675a..e9771426 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/repository/support/QueryByExampleValkeyExecutorIntegrationTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/repository/support/QueryByExampleValkeyExecutorIntegrationTests.java @@ -45,7 +45,7 @@ import io.valkey.springframework.data.valkey.core.mapping.ValkeyMappingContext; import io.valkey.springframework.data.valkey.core.mapping.ValkeyPersistentEntity; import io.valkey.springframework.data.valkey.repository.core.MappingValkeyEntityInformation; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; import org.springframework.data.repository.query.FluentQuery; /** @@ -65,7 +65,7 @@ class QueryByExampleValkeyExecutorIntegrationTests { @BeforeAll static void beforeAll() { - connectionFactory = ValkeyGlideConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class); + connectionFactory = ValkeyGlideConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class); } @BeforeEach diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/BoundKeyParams.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/BoundKeyParams.java index 18229e33..8b6df1bb 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/BoundKeyParams.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/BoundKeyParams.java @@ -31,7 +31,7 @@ import io.valkey.springframework.data.valkey.support.collections.DefaultValkeyMap; import io.valkey.springframework.data.valkey.support.collections.DefaultValkeySet; import io.valkey.springframework.data.valkey.support.collections.ValkeyList; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; /** * @author Costin Leau @@ -43,7 +43,7 @@ public class BoundKeyParams { public static Collection testParams() { // Jedis JedisConnectionFactory jedisConnFactory = JedisConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); StringValkeyTemplate templateJS = new StringValkeyTemplate(jedisConnFactory); DefaultValkeyMap mapJS = new DefaultValkeyMap("bound:key:map", templateJS); @@ -52,7 +52,7 @@ public static Collection testParams() { // Lettuce LettuceConnectionFactory lettuceConnFactory = LettuceConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); StringValkeyTemplate templateLT = new StringValkeyTemplate(lettuceConnFactory); DefaultValkeyMap mapLT = new DefaultValkeyMap("bound:key:mapLT", templateLT); @@ -61,7 +61,7 @@ public static Collection testParams() { // ValkeyGlide ValkeyGlideConnectionFactory vgConnFactory = ValkeyGlideConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); StringValkeyTemplate templateVG = new StringValkeyTemplate(vgConnFactory); DefaultValkeyMap mapVG = new DefaultValkeyMap("bound:key:mapVG", templateLT); diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/atomic/AtomicCountersParam.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/atomic/AtomicCountersParam.java index dff08709..3478f4ce 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/atomic/AtomicCountersParam.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/atomic/AtomicCountersParam.java @@ -24,7 +24,7 @@ import io.valkey.springframework.data.valkey.connection.lettuce.extension.LettuceConnectionFactoryExtension; import io.valkey.springframework.data.valkey.connection.valkeyglide.ValkeyGlideConnectionFactory; import io.valkey.springframework.data.valkey.connection.valkeyglide.extension.ValkeyGlideConnectionFactoryExtension; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; /** * @author Costin Leau @@ -38,15 +38,15 @@ static Collection testParams() { // Jedis JedisConnectionFactory jedisConnFactory = JedisConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); // Lettuce LettuceConnectionFactory lettuceConnFactory = LettuceConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class, false); + .getConnectionFactory(ValkeyStandalone.class, false); // Valkey-Glide ValkeyGlideConnectionFactory valkeyGlideConnFactory = ValkeyGlideConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); return Arrays.asList(new Object[][] { { jedisConnFactory }, { lettuceConnFactory }, { valkeyGlideConnFactory } }); } diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/collections/CollectionTestParams.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/collections/CollectionTestParams.java index 86fdba6a..44e8e9c6 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/collections/CollectionTestParams.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/collections/CollectionTestParams.java @@ -36,7 +36,7 @@ import io.valkey.springframework.data.valkey.serializer.OxmSerializer; import io.valkey.springframework.data.valkey.serializer.StringValkeySerializer; import io.valkey.springframework.data.valkey.test.XstreamOxmSerializerSingleton; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; /** * @author Costin Leau @@ -59,7 +59,7 @@ public static Collection testParams() { ObjectFactory rawFactory = new RawObjectFactory(); JedisConnectionFactory jedisConnFactory = JedisConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); ValkeyTemplate stringTemplate = new StringValkeyTemplate(jedisConnFactory); ValkeyTemplate personTemplate = new ValkeyTemplate<>(); @@ -90,7 +90,7 @@ public static Collection testParams() { // Lettuce LettuceConnectionFactory lettuceConnFactory = LettuceConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); ValkeyTemplate stringTemplateLtc = new StringValkeyTemplate(lettuceConnFactory); ValkeyTemplate personTemplateLtc = new ValkeyTemplate<>(); @@ -120,7 +120,7 @@ public static Collection testParams() { // ValkeyGlide ValkeyGlideConnectionFactory valkeyGlideConnFactory = ValkeyGlideConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); ValkeyTemplate stringTemplateVkg = new StringValkeyTemplate(valkeyGlideConnFactory); ValkeyTemplate personTemplateVkg = new ValkeyTemplate<>(); diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/collections/ValkeyCollectionFactoryBeanTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/collections/ValkeyCollectionFactoryBeanTests.java index 2ecf7fd3..dece491a 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/collections/ValkeyCollectionFactoryBeanTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/collections/ValkeyCollectionFactoryBeanTests.java @@ -29,7 +29,7 @@ import io.valkey.springframework.data.valkey.core.ValkeyCallback; import io.valkey.springframework.data.valkey.core.StringValkeyTemplate; import io.valkey.springframework.data.valkey.support.collections.ValkeyCollectionFactoryBean.CollectionType; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; /** * Integration tests for {@link ValkeyCollectionFactoryBean}. @@ -47,7 +47,7 @@ public class ValkeyCollectionFactoryBeanTests { ValkeyCollectionFactoryBeanTests() { ValkeyGlideConnectionFactory valkeyGlideConnFactory = ValkeyGlideConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); this.template = new StringValkeyTemplate(valkeyGlideConnFactory); } diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/collections/ValkeyMapIntegrationTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/collections/ValkeyMapIntegrationTests.java index 9299eb2f..c5d994e2 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/collections/ValkeyMapIntegrationTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/collections/ValkeyMapIntegrationTests.java @@ -37,7 +37,7 @@ import io.valkey.springframework.data.valkey.serializer.OxmSerializer; import io.valkey.springframework.data.valkey.serializer.StringValkeySerializer; import io.valkey.springframework.data.valkey.test.XstreamOxmSerializerSingleton; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; /** * Integration test for ValkeyMap. @@ -80,7 +80,7 @@ public static Collection testParams() { ObjectFactory rawFactory = new RawObjectFactory(); JedisConnectionFactory jedisConnFactory = JedisConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); ValkeyTemplate genericTemplate = new ValkeyTemplate(); genericTemplate.setConnectionFactory(jedisConnFactory); @@ -106,7 +106,7 @@ public static Collection testParams() { // Lettuce LettuceConnectionFactory lettuceConnFactory = LettuceConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class, false); + .getConnectionFactory(ValkeyStandalone.class, false); ValkeyTemplate genericTemplateLettuce = new ValkeyTemplate(); genericTemplateLettuce.setConnectionFactory(lettuceConnFactory); @@ -136,7 +136,7 @@ public static Collection testParams() { // ValkeyGlide ValkeyGlideConnectionFactory valkeyGlideConnFactory = ValkeyGlideConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); ValkeyTemplate genericTemplateVkg = new ValkeyTemplate(); genericTemplateVkg.setConnectionFactory(valkeyGlideConnFactory); genericTemplateVkg.afterPropertiesSet(); diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/collections/ValkeyPropertiesIntegrationTests.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/collections/ValkeyPropertiesIntegrationTests.java index de63e863..95287d48 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/collections/ValkeyPropertiesIntegrationTests.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/support/collections/ValkeyPropertiesIntegrationTests.java @@ -43,7 +43,7 @@ import io.valkey.springframework.data.valkey.serializer.Jackson2JsonValkeySerializer; import io.valkey.springframework.data.valkey.serializer.OxmSerializer; import io.valkey.springframework.data.valkey.test.XstreamOxmSerializerSingleton; -import io.valkey.springframework.data.valkey.test.extension.ValkeyStanalone; +import io.valkey.springframework.data.valkey.test.extension.ValkeyStandalone; import io.valkey.springframework.data.valkey.test.extension.parametrized.ParameterizedValkeyTest; /** @@ -201,7 +201,7 @@ public static Collection testParams() { ObjectFactory doubleFactory = new DoubleAsStringObjectFactory(); JedisConnectionFactory jedisConnFactory = JedisConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); ValkeyTemplate genericTemplate = new StringValkeyTemplate(jedisConnFactory); @@ -219,7 +219,7 @@ public static Collection testParams() { // Lettuce LettuceConnectionFactory lettuceConnFactory = LettuceConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class, false); + .getConnectionFactory(ValkeyStandalone.class, false); ValkeyTemplate genericTemplateLtc = new StringValkeyTemplate(lettuceConnFactory); ValkeyTemplate xGenericTemplateLtc = new ValkeyTemplate<>(); @@ -236,7 +236,7 @@ public static Collection testParams() { // ValkeyGlide ValkeyGlideConnectionFactory valkeyGlideConnFactory = ValkeyGlideConnectionFactoryExtension - .getConnectionFactory(ValkeyStanalone.class); + .getConnectionFactory(ValkeyStandalone.class); ValkeyTemplate genericTemplateVkg = new StringValkeyTemplate(valkeyGlideConnFactory); ValkeyTemplate xGenericTemplateVkg = new ValkeyTemplate<>(); diff --git a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/test/extension/ValkeyStanalone.java b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/test/extension/ValkeyStandalone.java similarity index 89% rename from spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/test/extension/ValkeyStanalone.java rename to spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/test/extension/ValkeyStandalone.java index 8204c47d..4a48a96f 100644 --- a/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/test/extension/ValkeyStanalone.java +++ b/spring-data-valkey/src/test/java/io/valkey/springframework/data/valkey/test/extension/ValkeyStandalone.java @@ -25,7 +25,7 @@ import io.valkey.springframework.data.valkey.SettingsUtils; /** - * {@code @ValkeyStanalone} is used to qualify a connection resource to point to Valkey Standalone. + * {@code @ValkeyStandalone} is used to qualify a connection resource to point to Valkey Standalone. * * @author Mark Paluch * @see SettingsUtils#getPort() @@ -34,5 +34,5 @@ @Retention(RetentionPolicy.RUNTIME) @Inherited @Documented -public @interface ValkeyStanalone { +public @interface ValkeyStandalone { }