#297 - Re-enable Redis reactive example.

Removed fixed versions of dependencies. Removed explicit declaration of Lettuce version as it is now managed by Boot. Switched to Lettuce as primary Redis driver in application setup. We keep using Jedis in the embedded server support.
This commit is contained in:
Oliver Gierke
2017-10-06 17:30:36 +02:00
parent d7fcdf5618
commit 6f3dd29431
4 changed files with 10 additions and 12 deletions

View File

@@ -18,7 +18,7 @@
<modules>
<module>cluster</module>
<module>example</module>
<!--<module>reactive</module>-->
<module>reactive</module>
<module>repositories</module>
<module>sentinel</module>
<module>util</module>
@@ -41,6 +41,7 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.github.kstyrc</groupId>
<artifactId>embedded-redis</artifactId>

View File

@@ -8,17 +8,10 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-redis-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
<spring-data-releasetrain.version>Kay-RC2</spring-data-releasetrain.version>
<spring.version>5.0.0.RC3</spring.version>
<reactor.version>3.1.0.M3</reactor.version>
<lettuce.version>5.0.0.RC1</lettuce.version>
</properties>
<dependencies>
<dependency>
@@ -34,7 +27,6 @@
<dependency>
<groupId>io.lettuce</groupId>
<artifactId>lettuce-core</artifactId>
<version>${lettuce.version}</version>
</dependency>
<dependency>

View File

@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.connection.RedisSentinelConfiguration;
import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.util.StopWatch;
@@ -74,7 +74,7 @@ public class RedisSentinelApplication {
}
public @Bean RedisConnectionFactory connectionFactory() {
return new JedisConnectionFactory(sentinelConfig());
return new LettuceConnectionFactory(sentinelConfig());
}
public @Bean RedisSentinelConfiguration sentinelConfig() {

View File

@@ -19,6 +19,11 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
</dependency>
<dependency>
<groupId>com.github.kstyrc</groupId>
<artifactId>embedded-redis</artifactId>