Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -60,17 +60,17 @@ private static Collection<ValkeyConnectionFactory> 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()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -62,14 +62,14 @@ public ScanTests(ValkeyConnectionFactory factory) {
public static List<ValkeyConnectionFactory> 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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down Expand Up @@ -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);
}
Expand All @@ -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<? extends Annotation> qualifier) {
Expand All @@ -119,7 +119,7 @@ public static JedisConnectionFactory getConnectionFactory(Class<? extends Annota
* Obtain a new {@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 getNewConnectionFactory(Class<? extends Annotation> qualifier) {
Expand Down Expand Up @@ -153,7 +153,7 @@ private static Class<? extends Annotation> getQualifier(ParameterContext paramet
return ValkeyCluster.class;
}

return ValkeyStanalone.class;
return ValkeyStandalone.class;
}

static class NewableLazy<T> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1157,7 +1157,7 @@ void createMinimalValkeyStandaloneConfiguration() {
}

@Test // GH-2116
void createFullValkeyStanaloneConfiguration() {
void createFullValkeyStandaloneConfiguration() {

RedisURI redisURI = RedisURI.create("redis://fooUser:fooPass@myserver1:111/7");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down Expand Up @@ -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);
}
Expand All @@ -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<? extends Annotation> qualifier) {
Expand All @@ -180,7 +180,7 @@ public static LettuceConnectionFactory getConnectionFactory(Class<? extends Anno
* 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<? extends Annotation> qualifier, boolean pooled) {
Expand Down Expand Up @@ -215,7 +215,7 @@ private static Class<? extends Annotation> getQualifier(ParameterContext paramet
return ValkeyCluster.class;
}

return ValkeyStanalone.class;
return ValkeyStandalone.class;
}

static class ManagedLettuceConnectionFactory extends LettuceConnectionFactory
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -40,7 +40,7 @@ class ValkeyGlideZSetOrderingIntegrationTests {
@Test
void rangeWithScoresStandaloneOrder() {
StringValkeyTemplate template = new StringValkeyTemplate(
ValkeyGlideConnectionFactoryExtension.getConnectionFactory(ValkeyStanalone.class));
ValkeyGlideConnectionFactoryExtension.getConnectionFactory(ValkeyStandalone.class));
try {
ZSetOperations<String, String> opsForZSet = template.opsForZSet();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
* <p><strong>Note:</strong> 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 {
Expand Down Expand Up @@ -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
}
Expand All @@ -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.
*/
Expand All @@ -119,7 +119,7 @@ public static ValkeyGlideConnectionFactory getConnectionFactory(Class<? extends
* Obtain a new {@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.
*/
Expand Down Expand Up @@ -165,7 +165,7 @@ private static Class<? extends Annotation> getQualifier(ParameterContext paramet
return ValkeyCluster.class;
}

return ValkeyStanalone.class;
return ValkeyStandalone.class;
}

static class NewableLazy<T> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -54,9 +54,9 @@ abstract public class AbstractOperationsTestParams {
public static Collection<Object[]> testParams() {

List<Object[]> 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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -79,7 +79,7 @@ public static Collection<Object[]> testParams() {
ObjectFactory<byte[]> rawFactory = new RawObjectFactory();

JedisConnectionFactory jedisConnectionFactory = JedisConnectionFactoryExtension
.getConnectionFactory(ValkeyStanalone.class);
.getConnectionFactory(ValkeyStandalone.class);

ValkeyTemplate<String, String> stringTemplate = new StringValkeyTemplate();
stringTemplate.setConnectionFactory(jedisConnectionFactory);
Expand All @@ -91,7 +91,7 @@ public static Collection<Object[]> testParams() {
rawTemplate.afterPropertiesSet();

ValkeyGlideConnectionFactory valkeyGlideConnectionFactory = ValkeyGlideConnectionFactoryExtension
.getConnectionFactory(ValkeyStanalone.class);
.getConnectionFactory(ValkeyStandalone.class);

ValkeyTemplate<String, String> vgStringTemplate = new StringValkeyTemplate();
vgStringTemplate.setConnectionFactory(valkeyGlideConnectionFactory);
Expand Down
Loading
Loading