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

DATAREDIS-1063 - Build against JDK 11+.

Browse Source
This commit is contained in:
Greg Turnquist
2019-11-05 13:21:34 -06:00
committed by Mark Paluch
parent 292c0a3756
commit a3d2ad7ed6
8 changed files with 126 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/java/org/springframework/data/redis/connection/AbstractTransactionalTestBase.java
View File

@@ -142,22 +142,22 @@ public abstract class AbstractTransactionalTestBase {
}
}
@Rollback(true)
@Test // DATAREDIS-73
@Rollback
@Test // DATAREDIS-73, DATAREDIS-1063
public void listOperationLPushShoudBeRolledBackCorrectly() {
for (String key : KEYS) {
template.opsForList().leftPushAll(key, (String[]) KEYS.toArray());
template.opsForList().leftPushAll(key, KEYS.toArray(new String[0]));
}
}
@Rollback(false)
@Test // DATAREDIS-73
@Test // DATAREDIS-73, DATAREDIS-1063
public void listOperationLPushShouldBeCommittedCorrectly() {
this.valuesShouldHaveBeenPersisted = true;
for (String key : KEYS) {
template.opsForList().leftPushAll(key, (String[]) KEYS.toArray());
template.opsForList().leftPushAll(key, KEYS.toArray(new String[0]));
}
}
}

17
src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryUnitTests.java
View File

@@ -18,24 +18,23 @@ package org.springframework.data.redis.connection.jedis;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import redis.clients.jedis.JedisCluster;
import redis.clients.jedis.JedisClusterConnectionHandler;
import redis.clients.jedis.JedisClusterInfoCache;
import redis.clients.jedis.JedisPoolConfig;
import sun.net.www.protocol.https.DefaultHostnameVerifier;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLParameters;
import javax.net.ssl.SSLSocketFactory;
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
import org.junit.Test;
import redis.clients.jedis.JedisCluster;
import redis.clients.jedis.JedisClusterConnectionHandler;
import redis.clients.jedis.JedisClusterInfoCache;
import redis.clients.jedis.JedisPoolConfig;
import org.springframework.data.redis.connection.RedisClusterConfiguration;
import org.springframework.data.redis.connection.RedisClusterConnection;
import org.springframework.data.redis.connection.RedisPassword;
@@ -237,9 +236,9 @@ public class JedisConnectionFactoryUnitTests {
SSLContext context = SSLContext.getDefault();
SSLSocketFactory socketFactory = context.getSocketFactory();
JedisPoolConfig poolConfig = new JedisPoolConfig();
JedisClientConfiguration configuration = JedisClientConfiguration.builder().useSsl() //
.hostnameVerifier(new DefaultHostnameVerifier()) //
.hostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()) //
.sslParameters(sslParameters) //
.sslSocketFactory(socketFactory).and() //
.clientName("my-client") //
@@ -298,7 +297,7 @@ public class JedisConnectionFactoryUnitTests {
SSLContext context = SSLContext.getDefault();
SSLSocketFactory socketFactory = context.getSocketFactory();
JedisPoolConfig poolConfig = new JedisPoolConfig();
HostnameVerifier hostNameVerifier = new DefaultHostnameVerifier();
HostnameVerifier hostNameVerifier = HttpsURLConnection.getDefaultHostnameVerifier();
JedisClientConfiguration configuration = JedisClientConfiguration.builder() //
.useSsl() //