Skip to content

Commit 797e17d

Browse files
christophstroblmp911de
authored andcommitted
Check if redis available before looking up its version.
See spring-projects#654
1 parent 0fb0b53 commit 797e17d

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

redis/util/src/main/java/example/springdata/redis/test/condition/EnabledOnCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
@Retention(RetentionPolicy.RUNTIME)
3737
@Inherited
3838
@Documented
39-
@ExtendWith(EnabledOnCommandCondition.class)
39+
@EnabledOnRedisAvailable
40+
@ExtendWith({EnabledOnRedisAvailableCondition.class})
4041
public @interface EnabledOnCommand {
4142

4243
String host() default "localhost";

redis/util/src/main/java/example/springdata/redis/test/condition/EnabledOnCommandCondition.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,18 @@
3636
*/
3737
class EnabledOnCommandCondition implements ExecutionCondition {
3838

39+
EnabledOnRedisAvailableCondition redisAvailable = new EnabledOnRedisAvailableCondition();
40+
3941
private static final ConditionEvaluationResult ENABLED_BY_DEFAULT = enabled("@EnabledOnCommand is not present");
4042
private static final ExtensionContext.Namespace NAMESPACE = ExtensionContext.Namespace.create(RedisConditions.class);
4143

4244
@Override
4345
public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
4446

47+
if(redisAvailable.evaluateExecutionCondition(context).isDisabled()) {
48+
return disabled("Redis not available");
49+
}
50+
4551
var optional = AnnotationUtils.findAnnotation(context.getElement(), EnabledOnCommand.class);
4652

4753
if (!optional.isPresent()) {

0 commit comments

Comments
 (0)