Spring/spring-data-examples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Java 16 migration for Redis examples.

Browse Source 
See #606.
This commit is contained in:
Mark Paluch
2021-04-29 11:03:21 +02:00
parent 338d9d92ca
commit 88aabe89e2
16 changed files with 77 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
redis/util/src/main/java/example/springdata/redis/test/util/ManagedClientResources.java
View File

@@ -41,9 +41,9 @@ class ManagedClientResources {
*/
static ClientResources getClientResources() {
AtomicReference<ClientResources> ref = instance.clientResources;
var ref = instance.clientResources;
ClientResources clientResources = ref.get();
var clientResources = ref.get();
if (clientResources != null) {
return clientResources;
}

8
redis/util/src/main/java/example/springdata/redis/test/util/RequiresRedisSentinel.java
View File

@@ -134,8 +134,8 @@ public class RequiresRedisSentinel implements TestRule {
private void verify(SentinelsAvailable verificationMode) {
int failed = 0;
for (RedisNode node : sentinelConfig.getSentinels()) {
var failed = 0;
for (var node : sentinelConfig.getSentinels()) {
if (!isAvailable(node)) {
failed++;
}
@@ -163,10 +163,10 @@ public class RequiresRedisSentinel implements TestRule {
private boolean isAvailable(RedisNode node) {
RedisClient redisClient = RedisClient.create(ManagedClientResources.getClientResources(),
var redisClient = RedisClient.create(ManagedClientResources.getClientResources(),
RedisURI.create(node.getHost(), node.getPort()));
try (StatefulRedisConnection<String, String> connection = redisClient.connect()) {
try (var connection = redisClient.connect()) {
connection.sync().ping();
} catch (Exception e) {
return false;

12
redis/util/src/main/java/example/springdata/redis/test/util/RequiresRedisServer.java
View File

@@ -98,7 +98,7 @@ public class RequiresRedisServer extends ExternalResource {
@Override
protected void before() throws Throwable {
try (Socket socket = new Socket()) {
try (var socket = new Socket()) {
socket.setTcpNoDelay(true);
socket.setSoLinger(true, 0);
socket.connect(new InetSocketAddress(host, port), timeout);
@@ -110,14 +110,14 @@ public class RequiresRedisServer extends ExternalResource {
return;
}
RedisClient redisClient = RedisClient.create(ManagedClientResources.getClientResources(),
var redisClient = RedisClient.create(ManagedClientResources.getClientResources(),
RedisURI.create(host, port));
try (StatefulRedisConnection<String, String> connection = redisClient.connect()) {
try (var connection = redisClient.connect()) {
String infoServer = connection.sync().info("server");
String redisVersion = LettuceConverters.stringToProps().convert(infoServer).getProperty("redis_version");
Version runningVersion = Version.parse(redisVersion);
var infoServer = connection.sync().info("server");
var redisVersion = LettuceConverters.stringToProps().convert(infoServer).getProperty("redis_version");
var runningVersion = Version.parse(redisVersion);
if (runningVersion.isLessThan(requiredVersion)) {
throw new AssumptionViolatedException(String